Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorkild U. Resheim2018-03-31 19:10:49 +0000
committerTorkild U. Resheim2018-04-19 11:39:28 +0000
commit66f10e08bc22cfbf5afbfbf8aeb748bf00e88cc0 (patch)
tree8ad0365fb124493b96aa50a3f085c9a1fea3cc4e
parent4b857d0b3f1dc9147fcd8ce34bd614c921704a60 (diff)
downloadorg.eclipse.mylyn.docs-66f10e08bc22cfbf5afbfbf8aeb748bf00e88cc0.tar.gz
org.eclipse.mylyn.docs-66f10e08bc22cfbf5afbfbf8aeb748bf00e88cc0.tar.xz
org.eclipse.mylyn.docs-66f10e08bc22cfbf5afbfbf8aeb748bf00e88cc0.zip
533122: Switch to EPL 2.0 from EPL 1.0.1
* Update source files with new license and SPDX License Identifier * Update about.html with new license and date * Update license feature reference in feature.xml & tp * Update license references in documentation and other files Change-Id: I98fe977ad55b81e995087535994d3df0d4904393 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=533122
-rw-r--r--LICENSE277
-rw-r--r--docs/org.eclipse.mylyn.docs.development-feature/build.properties6
-rw-r--r--docs/org.eclipse.mylyn.docs.development-feature/feature.properties6
-rw-r--r--docs/org.eclipse.mylyn.docs.development-feature/feature.xml8
-rw-r--r--docs/org.eclipse.mylyn.docs.sdk-feature/build.properties6
-rw-r--r--docs/org.eclipse.mylyn.docs.sdk-feature/feature.properties6
-rw-r--r--docs/org.eclipse.mylyn.docs.sdk-feature/feature.xml8
-rw-r--r--docs/org.eclipse.mylyn.htmltext-feature/build.properties8
-rw-r--r--docs/org.eclipse.mylyn.htmltext-feature/feature.properties6
-rw-r--r--docs/org.eclipse.mylyn.htmltext-feature/feature.xml8
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/OSGI-INF/l10n/bundle.properties2
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/about.html6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/base.html4
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/externalconfiguration.js5
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js7
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/integration.js5
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlComposer.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlTextActivator.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/Command.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/GetHtmlCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/SetHtmlCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/BoldCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/ItalicCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/StrikeCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SubscriptCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SuperscriptCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/UnderlineCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditAnchorCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditImageCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditLinkCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditTableCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/InsertHrCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/RemoveFormatCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetBackgroundColorCommand.java8
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFontFamilyCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetForegroundColorCommand.java8
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFormatCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetSizeCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/UnlinkCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/IndentCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/OutdentCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyBlockCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyCenterCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyLeftCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyRightCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/BulletlistCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/NumlistCommand.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/AutoparagrahConfiguration.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/Configuration.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ConfigurationElement.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/EnterModeConfiguration.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ShiftEnterModeConfiguration.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/UseEntitiesConfiguration.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/events/NodeSelectionEvent.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/listener/NodeSelectionChangeListener.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/model/TriState.java6
-rw-r--r--docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/util/ColorConverter.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/about.html6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/build.properties6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java15
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java17
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java15
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/about.html6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/build.ant6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/build.properties6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/epubcheck.xml4
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.ant6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.src2
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/AllTests.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java20
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java34
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java13
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties6
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java18
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java8
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java14
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java18
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java25
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java31
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java14
-rw-r--r--epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java10
-rw-r--r--epub/core/pom.xml4
-rw-r--r--epub/pom.xml4
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub-feature/build.properties6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.properties6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml2
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/about.html6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/book.css2
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant8
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/build.properties6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/docs/style.css4
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/plugin.properties8
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.help/toc.xml6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/build.properties6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.properties6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.xml14
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/about.html6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/build.properties6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/plugin.properties8
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java8
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java14
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java29
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java11
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties6
-rw-r--r--epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties6
-rw-r--r--epub/ui/targets/epub.target-template2
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/MarkupTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/tasks.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/AbstractTestAntTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTaskTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/plugin.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocMarkupLanguageConfiguration.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocContentState.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AsciiDocBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AttributeDefinitionBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CodeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CommentBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/DefinitionListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HorizontalRuleBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/InlineHtmlBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PreformattedBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PropertiesLineBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TableBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TitleLineBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/UnderlinedHeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/BackslashEscapePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/CssClassPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/SimplePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AbstractAsciidocMacroReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkMacroReplacementToken.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementTokenProcessor.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/EmailLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ExplicitLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitFormattedLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineAttributeReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineCommentReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineEscapedAttributeReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineImageReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/PreserverHtmlEntityToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefMacroReplacementToken.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementTokenProcessor.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LanguageSupport.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LookAheadReader.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadDispatcher.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAnchorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAttributeTest.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageBlockElementsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCodeBlockElementsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCommentBlockElementsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageHorizontalRuleTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageImageTest.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageLinksTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageListTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageMiscellaneousTest.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguagePreformattedBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSpanElementsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSupportTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTableTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTestBase.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageWithConfigurationIntegrationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageXrefTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMark.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ContentLineSequence.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/InlineContent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/Line.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicates.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequence.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterable.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LookAheadLineSequence.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequence.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContext.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocator.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocks.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegment.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelper.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequence.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AbstractHtmlBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockWithNestedBlocks.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCdataBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlDoctypeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlProcessingInstructionBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1Block.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType7Block.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AllCharactersSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Characters.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Code.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Emphasis.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/EscapedCharacter.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HardLineBreak.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntity.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTag.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Image.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Inline.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithNestedContents.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithText.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlinesSubstitution.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Link.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketDelimiter.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiter.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisDelimiter.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/ReferenceDefinition.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SoftLineBreak.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SourceSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpan.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Strong.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageDocumentOffsetsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkAsserts.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicatesTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequenceTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterableTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequenceTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocatorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocksTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegmentTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelperTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequenceTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1BlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AbstractSourceSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CursorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursors.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiterTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpanTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/CommonMarkSpecTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/SimplifiedHtmlDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/plugin.properties8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceContentState.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/AbstractConfluenceDelimitedBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/CodeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ColorBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedPreformattedBlock.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedQuoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/HeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParameterizedBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/QuoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableOfContentsBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TextBoxBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ColorPhraseModifier.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ConfluenceWrappedPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/EmphasisPhraseModifier.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/HyperlinkPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ImagePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimplePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimpleWrappedPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/AnchorReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/EscapedCharacterReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/HorizontalRuleToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/ImpliedHyperlinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/NumericEntityReferenceReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Colors.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Options.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/validation/ConfluenceReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceCodeBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageIntegrationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLineBreakTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/util/ColorsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/plugin.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/CreoleLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HorizontalRuleBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/NowikiBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/TableBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/EscapePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/NowikiPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/SimplePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/token/LinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/validation/CreoleReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.creole/src/test/java/org/eclipse/mylyn/internal/wikitext/creole/tests/CreoleLanguageTest.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.html/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockSeparator.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategies.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementMatcher.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementStrategies.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlElementStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/LiteralHtmlDocumentHandler.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/NoOpBlockStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanHtmlElementStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedBlockStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedSpanStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedBlockStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedSpanStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlLanguageIntegrationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderXhtmlStrictTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/plugin.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/MarkdownLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinition.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionUsageTracker.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownContentState.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/CodeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HorizontalRuleBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/InlineHtmlBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/LinkDefinitionBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/NestableBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/QuoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/UnderlinedHeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/BackslashEscapePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/SimplePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/AutomaticLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineImageReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/PreserverHtmlEntityToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleImageReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/LookAheadReader.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadDispatcher.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/LinkDefinitionValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/MarkdownReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionValidationRuleTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownHeadingTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageBlockElementsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageMiscellaneousTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageParagraphBreakingBlocksDisabledTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageSpanElementsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTestBase.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownReferenceValidationRuleTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownRoundTripTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/BuildFailureException.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojo.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversal.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojoTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ConfigurationException.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/HtmlSourceImageFetchingStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ImageFetchingStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiApiImageFetchingStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcher.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/messages.properties8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/tasks.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcherTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiMockFixture.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiApiImageFetchingStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiImageFetcher.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestWikiToDocTask.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskIntegrationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/plugin.properties8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/MediaWikiLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/PageMapping.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/Template.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/TemplateResolver.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolver.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/AbstractMediaWikiLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/BuiltInTemplateResolver.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/DateTimeTemplate.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/AbstractTableOfContentsBlock.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/BehaviorSwitchBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/CommentBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/EscapeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/HeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/PreformattedBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/SourceBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableOfContentsBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/messages.properties8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/EscapePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimplePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimpleWrappedPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/EntityReferenceReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkExternalReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkInternalReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/ImageReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/LineBreakToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/MediaWikiReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/TestWikiTemplateResolver.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/builder/DitaTopicDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/AbstractSaxParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/HtmlParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/XHtmlParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderIntegrationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/RecordingDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderIntegrationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/plugin.properties8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/TextileLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/Textile.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileContentState.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/AbstractTableOfContentsBlock.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CodeBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/DefinitionListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/FootnoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/HeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileTagBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/PreformattedBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/QuoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableOfContentsBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TextileGlossaryBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/HyperlinkPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/ImageTextilePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/SimpleTextilePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/EntityReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/FootnoteReferenceReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_de.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_fr.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileCommentBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageDefinitionListTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileNoTextileTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderEntityReferenceTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/AbstractMarkupGenerationTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/RecordingDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/StackDumpOnTimeoutRule.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/TestResources.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/plugin.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguage.java31
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/DefinitionListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/HeadingBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ListBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ParagraphBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/PreformattedBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/QuoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/TableBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/EscapePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/MonospacePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimplePhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimpleWrappedPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/BangEscapeToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ChangesetLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/HyperlinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/LineBreakToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MacroReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MilestoneLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ReportLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/RevisionLogReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/SourceLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketAttachmentLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiLinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiWordReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/validation/TracWikiReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/WikiWordReplacementTokenTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/plugin.properties6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/TWikiLanguage.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/DefinitionListBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HeadingBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HorizontalRuleBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ListBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/LiteralBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ParagraphBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/TableOfContentsBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/VerbatimBlock.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/AutoLinkSwitchPhraseModifier.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimplePhraseModifier.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimpleWrappedPhraseModifier.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/IconReplacementToken.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/ImpliedEmailLinkReplacementToken.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/LinkReplacementToken.java6
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/WikiWordReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/TWikiReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/resources/services/org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage2
-rwxr-xr-xwikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/internal/wikitext/twiki/tests/TWikiLanguageTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/about.html6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/plugin.properties8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/AbstractSaxHtmlParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessor.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/Html.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleaner.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveEmptySpansProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveExcessiveStylesProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RepairBrokenCSSColorStylesProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/WhitespaceCleanupProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/util/ConcatenatingReader.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Attributes.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/DocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HeadingAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HtmlParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/IdGenerator.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ImageAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/LinkAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ListAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Locator.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/MarkupParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/QuoteAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableCellAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableRowAttributes.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractMarkupDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractXmlDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaBookMapDocumentBuilder.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaTopicDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferences.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventLoggingDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentHandler.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntities.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/NoOpDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvents.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEvent.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/html-entity-references.txt2
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/AnySelector.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Block.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CompositeSelector.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssClassSelector.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/DescendantSelector.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/ElementInfo.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/IdSelector.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/NameSelector.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Selector.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequence.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Stylesheet.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/AbstractMarkupLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Block.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ConfigurationBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ContentState.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/DefaultIdGenerationStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/IdGenerationStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageConfiguration.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProvider.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElement.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElementProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Processor.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/AbstractHtmlBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaGeneratedCommentBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaQuoteBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/EclipseErrorDetailsBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/GlossaryBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/HtmlPreformattedBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/JavaStackTraceBlock.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlCommentPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlEndTagPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlStartTagPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlEndTagPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlStartTagPhraseModifier.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LiteralPhraseModifierProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/AcronymReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReferenceReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReplacementTokenProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityWrappingReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/ImpliedHyperlinkReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LineBreakReplacementTokenProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LiteralReplacementTokenProcessor.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternEntityReferenceReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLineBreakReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLiteralReplacementToken.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineItem.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToDocbook.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToEclipseToc.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/Matcher.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MatcherAdaper.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/NoSplittingStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplitOutlineItem.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingHtmlDocumentBuilder.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingMarkupToEclipseToc.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingOutlineParser.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingStrategy.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriter.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriter.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/IgnoreDtdEntityResolver.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocationTrackingReader.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocatorImpl.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/ServiceLocator.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriter.java8
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapter.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/DocumentLocalReferenceValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/MarkupValidator.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/Messages.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidator.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationProblem.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRules.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/messages.properties6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/package-info.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguage.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguageProvider.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/test/EqualityAsserts.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleanerTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/util/LocationTrackingReaderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/AttributesTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/ServiceLocatorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapterTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java6
-rw-r--r--wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/test-plugin.xml8
-rw-r--r--wikitext/core/pom.xml4
-rw-r--r--wikitext/pom.xml4
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext-feature/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.xml8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/src/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocTemplateResolverTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/plugin.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/META-INF/l10n/bundle.properties2
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/src/org/eclipse/mylyn/internal/wikitext/commonmark/ui/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/build.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/src/org/eclipse/mylyn/internal/wikitext/confluence/ui/package-info.java6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/build.properties6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/plugin.properties6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingEditorTracker.java6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingListener.java6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextStructureBridge.java6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiBridge.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiPlugin.java6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiStartup.java6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextUserInteractionMonitor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/actions/ToggleActiveFoldingEditorActionDelegate.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/build.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/plugin.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/src/org/eclipse/mylyn/internal/wikitext/creole/ui/packge-info.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/feature.xml2
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.xml8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build-helper.xml10
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/customBuildCallbacks.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/toc.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/contextHelp.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/customBuildCallbacks.xml4
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/docs/new/new-3.1.xml8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn-WikiText-User-Guide.textile2
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText-Developer-Guide.textile2
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/examples/build-wikitext-to-dita.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc-sdk.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/plugin.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/src/org/eclipse/mylyn/internal/wikitext/mediawiki/ui/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/MockMarkupLanguage.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocatorTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi/META-INF/l10n/bundle.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocator.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/WikiTextTasksUiPlugin.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/commands/IncrementalFindHandler.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/ConfluenceMarkupTaskEditorExtension.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MarkdownMarkupTaskEditorExtension.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MediaWikiMarkupTaskEditorExtension.java6
-rwxr-xr-xwikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TWikiMarkupTaskEditorExtension.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TextileMarkupTaskEditorExtension.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TracWikiMarkupTaskEditorExtension.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/MarkupViewerPreferencePage.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/Util.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaGeneratedCommentBlock.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaQuoteBlock.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/MarkupTaskEditorExtension.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/build.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/src/org/eclipse/mylyn/internal/wikitext/textile/ui/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/build.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/src/org/eclipse/mylyn/internal/wikitext/tracwiki/ui/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/build.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/src/org/eclipse/mylyn/internal/wikitext/twiki/ui/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileTypesTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/ScreenshotOnTimeoutRule.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/AbstractDocumentTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/DialectDocumentProviderTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitionerTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScannerTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocatorTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactoryTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapterTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManagerTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParserTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/ConfigurationBuilderTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageConfigurationTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/EntityWrappingReplacementTokenTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/ImpliedHyperlinkReplacementTokenTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineItemTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineParserTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/MarkupToEclipseTocTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/TextileToDocbookTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/util/ServiceLocatorIntegrationTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/AbstractTestInWorkspace.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassFilter.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassTraversal.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/DiscoveryTestSuite.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/EclipseRuntimeRequired.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadRequired.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessStandaloneTests.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessTests.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/NoDiscovery.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/TestUtil.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/UITests.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/BugzillaTextileLanguageTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/TextileLanguageTasksTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotationTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotationTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotationTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotationTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotationTest.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/about.html6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/build.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.properties8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.xml6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/cheatSheet.exsd4
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/contentAssist.exsd4
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupLanguage.exsd4
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupValidationRule.exsd4
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/relativeFilePathHyperlinkDetector.exsd4
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextNature.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextUiPlugin.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/ConvertMarkupToMarkup.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/WikiMarkupGenerationContribution.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FindAndReplaceTarget.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FoldingStructure.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/HeadingProjectionAnnotation.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/IFoldingStructure.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorActionBarContributor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorOutline.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupProjectionViewer.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/CollapseAllFoldingRulerAction.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ContextHelpAction.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ExpandAllFoldingRulerAction.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/PreviewOutlineItemAction.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/SetMarkupLanguageAction.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ToggleFoldingRulerAction.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/AnchorCompletionProcessor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MarkupTemplateCompletionProcessor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MultiplexingContentAssistProcessor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/SourceTemplateContextType.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Templates.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/WikiTextTemplateAccess.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowCheatSheetCommand.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowQuickOutlineCommand.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/DndConfigurationStrategy.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDragSourceListener.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDropTargetListener.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/CheatSheetContent.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/HelpContent.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/AbstractDocumentCommand.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/CommandManager.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/InsertLocation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/MoveSectionsCommand.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/QuickOutlinePopupDialog.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/CssStyleFieldEditor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/EditorPreferencePage.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/PreferenceInitializer.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Preferences.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/WikiTextTemplatePreferencePage.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupMonoReconciler.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupValidationReconcilingStrategy.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MultiReconcilingStrategy.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Block.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/EditFileHyperlink.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitioner.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FileRefHyperlinkDetector.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDamagerRepairer.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDocumentProvider.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupHyperlinkDetector.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScanner.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segment.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segments.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Span.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/AnnotationMarkupValidator.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/DocumentRegionValidator.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ResourceMarkerMarkupValidator.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ValidationProblemAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/ProjectPropertyPage.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocator.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextExtensionPointReader.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/HyperlinkDetectorDelegate.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/IOUtil.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/ImageCache.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/InformationPresenterUtil.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/NlsResourceBundle.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactory.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapter.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/PreferenceStoreFacade.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/WikiTextUiResources.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/Colors.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentDamagerRepairer.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentRule.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssBlockScanner.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssConfiguration.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitionScanner.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitioner.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssScanner.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssWhitespaceDetector.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyNameRule.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyValueRule.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/SelectorRule.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/package-info.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/ValidationProjectBuilder.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/AnnotationHyperlinkDetector.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManager.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/FontState.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParser.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/ImageManager.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/TextHover.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Util.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletDrawingStrategy.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleDrawingStrategy.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageDrawingStrategy.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/WikiText.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotation.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/AbstractMarkupResourceHandler.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToDocbook.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToEclipseHelp.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToHtml.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/messages.properties6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextDocumentProvider.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextSourceEditorOutline.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/DefaultWikiTextSourceEditorOutline.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewer.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewerConfiguration.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/ShowInTargetBridge.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextDocumentProvider.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourceEditor.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourcePartitioning.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/AbstractTextSourceViewerConfiguration.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/DefaultHyperlinkDetectorDescriptorFilter.java8
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlTextPresenter.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewer.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewerConfiguration.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupTextPresenter.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewer.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewerConfiguration.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/Messages.java6
-rw-r--r--wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/messages.properties6
-rw-r--r--wikitext/ui/targets/wikitext.target-template2
1204 files changed, 5274 insertions, 2685 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..d3087e4c5
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,277 @@
+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.
diff --git a/docs/org.eclipse.mylyn.docs.development-feature/build.properties b/docs/org.eclipse.mylyn.docs.development-feature/build.properties
index 0d1619717..a689c7988 100644
--- a/docs/org.eclipse.mylyn.docs.development-feature/build.properties
+++ b/docs/org.eclipse.mylyn.docs.development-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2015 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.docs.development-feature/feature.properties b/docs/org.eclipse.mylyn.docs.development-feature/feature.properties
index a33813516..c4b3e3c63 100644
--- a/docs/org.eclipse.mylyn.docs.development-feature/feature.properties
+++ b/docs/org.eclipse.mylyn.docs.development-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2015 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.docs.development-feature/feature.xml b/docs/org.eclipse.mylyn.docs.development-feature/feature.xml
index bfa8578f8..d40fbf9fa 100644
--- a/docs/org.eclipse.mylyn.docs.development-feature/feature.xml
+++ b/docs/org.eclipse.mylyn.docs.development-feature/feature.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2011, 2014 Tasktop Techonologies and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Tasktop Techonologies - initial API and implementation
@@ -16,7 +18,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.wikitext.core"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/docs/org.eclipse.mylyn.docs.sdk-feature/build.properties b/docs/org.eclipse.mylyn.docs.sdk-feature/build.properties
index fa6d2d97a..1eed15a86 100644
--- a/docs/org.eclipse.mylyn.docs.sdk-feature/build.properties
+++ b/docs/org.eclipse.mylyn.docs.sdk-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.docs.sdk-feature/feature.properties b/docs/org.eclipse.mylyn.docs.sdk-feature/feature.properties
index cbe392126..3980ca3f4 100644
--- a/docs/org.eclipse.mylyn.docs.sdk-feature/feature.properties
+++ b/docs/org.eclipse.mylyn.docs.sdk-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.docs.sdk-feature/feature.xml b/docs/org.eclipse.mylyn.docs.sdk-feature/feature.xml
index 86ae77a70..160f4f327 100644
--- a/docs/org.eclipse.mylyn.docs.sdk-feature/feature.xml
+++ b/docs/org.eclipse.mylyn.docs.sdk-feature/feature.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2011, 2014 Tasktop Techonologies and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Tasktop Techonologies - initial API and implementation
@@ -16,7 +18,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.wikitext"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/docs/org.eclipse.mylyn.htmltext-feature/build.properties b/docs/org.eclipse.mylyn.htmltext-feature/build.properties
index 4af12dc6f..1eed15a86 100644
--- a/docs/org.eclipse.mylyn.htmltext-feature/build.properties
+++ b/docs/org.eclipse.mylyn.htmltext-feature/build.properties
@@ -1,12 +1,14 @@
###############################################################################
# Copyright (c) 2011, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
###############################################################################
bin.includes = feature.properties,\
- feature.xml \ No newline at end of file
+ feature.xml
diff --git a/docs/org.eclipse.mylyn.htmltext-feature/feature.properties b/docs/org.eclipse.mylyn.htmltext-feature/feature.properties
index eb0b334e0..f3350d37b 100644
--- a/docs/org.eclipse.mylyn.htmltext-feature/feature.properties
+++ b/docs/org.eclipse.mylyn.htmltext-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.htmltext-feature/feature.xml b/docs/org.eclipse.mylyn.htmltext-feature/feature.xml
index 6471380fc..1bc86137f 100644
--- a/docs/org.eclipse.mylyn.htmltext-feature/feature.xml
+++ b/docs/org.eclipse.mylyn.htmltext-feature/feature.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2011, 2014 Tasktop Techonologies and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Tasktop Techonologies - initial API and implementation
@@ -16,7 +18,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.htmltext.ui"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/OSGI-INF/l10n/bundle.properties b/docs/org.eclipse.mylyn.htmltext.ui/OSGI-INF/l10n/bundle.properties
index e87fb0fac..34cada629 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/OSGI-INF/l10n/bundle.properties
+++ b/docs/org.eclipse.mylyn.htmltext.ui/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
#Properties file for org.eclipse.mylyn.htmltext
Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn HtmlText \ No newline at end of file
+Bundle-Name = Mylyn HtmlText
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/about.html b/docs/org.eclipse.mylyn.htmltext.ui/about.html
index 74f8e6a38..d1bcd26c2 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/about.html
+++ b/docs/org.eclipse.mylyn.htmltext.ui/about.html
@@ -8,13 +8,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 28, 2007</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/base.html b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/base.html
index c1e407959..705dfc633 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/base.html
+++ b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/base.html
@@ -2,9 +2,9 @@
<!--
Copyright (c) 2010 Tom Seidel, Remus Software
All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+http://www.eclipse.org/legal/epl-v20.html
Contributors:
Tom Seidel - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/externalconfiguration.js b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/externalconfiguration.js
index fdead23ae..9ecf32fa4 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/externalconfiguration.js
+++ b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/externalconfiguration.js
@@ -1,10 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
*
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Tom Seidel - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js
index a15bcfa72..997fb950d 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js
+++ b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js
@@ -1,10 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
*
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Tom Seidel - initial API and implementation
@@ -153,4 +154,4 @@ EclipseStyles.prototype.buildFontStyle = function(fontFamily) {
vars['family'] = fontFamily;
var fontSizeStyle = new CKEDITOR.style( CKEDITOR.config.font_style, vars );
return fontSizeStyle;
-} \ No newline at end of file
+}
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/integration.js b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/integration.js
index 01717ed12..08b781aeb 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/integration.js
+++ b/docs/org.eclipse.mylyn.htmltext.ui/eclipsebridge/integration.js
@@ -1,10 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
*
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Tom Seidel - initial API and implementation
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlComposer.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlComposer.java
index ec8248858..74d5d1a86 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlComposer.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlComposer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlTextActivator.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlTextActivator.java
index 7ec1b945a..3f7647a19 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlTextActivator.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/HtmlTextActivator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/Command.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/Command.java
index 938f87139..e32163254 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/Command.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/Command.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/GetHtmlCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/GetHtmlCommand.java
index 57225ceb6..eea4dedd0 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/GetHtmlCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/GetHtmlCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/SetHtmlCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/SetHtmlCommand.java
index dd5e95cb3..12a740cd5 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/SetHtmlCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/SetHtmlCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/BoldCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/BoldCommand.java
index 207af9139..726f857e5 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/BoldCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/BoldCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/ItalicCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/ItalicCommand.java
index 3e8a53d35..a42ed2093 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/ItalicCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/ItalicCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/StrikeCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/StrikeCommand.java
index bd7b6b6fd..69f3f4c13 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/StrikeCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/StrikeCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SubscriptCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SubscriptCommand.java
index 8a04323a5..5a2c5f6a9 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SubscriptCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SubscriptCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SuperscriptCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SuperscriptCommand.java
index 3cb79a5f4..1721efe17 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SuperscriptCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/SuperscriptCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/UnderlineCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/UnderlineCommand.java
index c0352e0b7..21990d7d8 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/UnderlineCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/basicstyle/UnderlineCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditAnchorCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditAnchorCommand.java
index c4f88e509..0df1073a4 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditAnchorCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditAnchorCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditImageCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditImageCommand.java
index 79554f166..01672c78c 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditImageCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditImageCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditLinkCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditLinkCommand.java
index 7c8712615..24b6b1448 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditLinkCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditLinkCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditTableCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditTableCommand.java
index 966458c5f..84628520f 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditTableCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/dialog/InsertEditTableCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/InsertHrCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/InsertHrCommand.java
index cd0945d60..aa5432bdb 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/InsertHrCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/InsertHrCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/RemoveFormatCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/RemoveFormatCommand.java
index d1e9308ae..c9c8fc005 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/RemoveFormatCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/RemoveFormatCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetBackgroundColorCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetBackgroundColorCommand.java
index e8da7a527..e3b3c0dd3 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetBackgroundColorCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetBackgroundColorCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
@@ -52,4 +54,4 @@ public class SetBackgroundColorCommand extends Command {
return false;
}
-} \ No newline at end of file
+}
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFontFamilyCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFontFamilyCommand.java
index 4602b7983..2dc6ff679 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFontFamilyCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFontFamilyCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetForegroundColorCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetForegroundColorCommand.java
index ab813f2df..0fffa8821 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetForegroundColorCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetForegroundColorCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
@@ -52,4 +54,4 @@ public class SetForegroundColorCommand extends Command {
return false;
}
-} \ No newline at end of file
+}
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFormatCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFormatCommand.java
index 65f6a0bab..b073133a2 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFormatCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetFormatCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetSizeCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetSizeCommand.java
index a7a71fab6..2031f05a7 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetSizeCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/SetSizeCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/UnlinkCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/UnlinkCommand.java
index 5eddfe5dc..af70136e9 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/UnlinkCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/formatting/UnlinkCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/IndentCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/IndentCommand.java
index b798565ef..79841e645 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/IndentCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/IndentCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/OutdentCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/OutdentCommand.java
index 03ab654c8..9502d3ffb 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/OutdentCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/indent/OutdentCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyBlockCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyBlockCommand.java
index 4059d3d98..03075ec61 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyBlockCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyBlockCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyCenterCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyCenterCommand.java
index 2cc2c4721..420baa60d 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyCenterCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyCenterCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyLeftCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyLeftCommand.java
index 432d26440..b229c2d93 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyLeftCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyLeftCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyRightCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyRightCommand.java
index 51acde8d2..c8707fddb 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyRightCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/justify/JustifyRightCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/BulletlistCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/BulletlistCommand.java
index 1f291fc2a..6dc5f9f05 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/BulletlistCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/BulletlistCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/NumlistCommand.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/NumlistCommand.java
index 9e59ac1c5..59bfdc60e 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/NumlistCommand.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/commands/list/NumlistCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/AutoparagrahConfiguration.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/AutoparagrahConfiguration.java
index 350bc3854..f38472a51 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/AutoparagrahConfiguration.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/AutoparagrahConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/Configuration.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/Configuration.java
index 543bc0b4a..700ef3af1 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/Configuration.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/Configuration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ConfigurationElement.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ConfigurationElement.java
index 35c41d78a..6f4834f11 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ConfigurationElement.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ConfigurationElement.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/EnterModeConfiguration.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/EnterModeConfiguration.java
index 83cbb1a03..ca9971c60 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/EnterModeConfiguration.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/EnterModeConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ShiftEnterModeConfiguration.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ShiftEnterModeConfiguration.java
index 793de9367..0ce4a6b42 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ShiftEnterModeConfiguration.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/ShiftEnterModeConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/UseEntitiesConfiguration.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/UseEntitiesConfiguration.java
index 6a491c0be..6435fb9be 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/UseEntitiesConfiguration.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/configuration/UseEntitiesConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/events/NodeSelectionEvent.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/events/NodeSelectionEvent.java
index 03082b890..9234cef51 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/events/NodeSelectionEvent.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/events/NodeSelectionEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/listener/NodeSelectionChangeListener.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/listener/NodeSelectionChangeListener.java
index 03b866a8d..c32c6d77f 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/listener/NodeSelectionChangeListener.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/listener/NodeSelectionChangeListener.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/model/TriState.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/model/TriState.java
index 38e0a9e89..6b4f893c7 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/model/TriState.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/model/TriState.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/util/ColorConverter.java b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/util/ColorConverter.java
index 19c4ae34e..a8da3fc49 100644
--- a/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/util/ColorConverter.java
+++ b/docs/org.eclipse.mylyn.htmltext.ui/src/org/eclipse/mylyn/htmltext/util/ColorConverter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Tom Seidel, Remus Software
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/about.html b/epub/core/org.eclipse.mylyn.docs.epub.ant/about.html
index da126e466..193bdda08 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/about.html
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/build.properties b/epub/core/org.eclipse.mylyn.docs.epub.ant/build.properties
index af6d34402..2634580f2 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/build.properties
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2017 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java
index bf69e6234..77709f569 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
@@ -16,7 +18,6 @@ import org.apache.tools.ant.Task;
import org.eclipse.mylyn.docs.epub.core.ILogger;
/**
- *
* @author Torkild U. Resheim
*/
public class AntLogger implements ILogger {
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java
index b9532a3be..93301a958 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java
index bc916955b..d03ba06fe 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java
index 81fe18422..8545afade 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java
index 45d065889..37c986fda 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java
index 362ee047e..1dd951b59 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
index 9029c557e..f2c681caf 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011, 2015 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java
index 170b5fd83..93857fccb 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java
index 8ab3279f3..17b5de527 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java
index 62a87122c..ddae22a54 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java
index 391fa7551..3015a823a 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Torkild U. Resheim and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java
index 38fb31fd2..a6b2c19ed 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
@@ -48,7 +51,7 @@ public class ItemType {
/**
* A file on the local file system.
- *
+ *
* @param file
* @ant.required
*/
@@ -80,7 +83,7 @@ public class ItemType {
/**
* A page on the wiki.
- *
+ *
* @param page
*/
public void setPage(String page) {
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java
index 1f443d59b..4f9431261 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java
index e640811da..aace8fbc1 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java
index afc4d7408..d1b3c323e 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java
index 82fa04985..98a8fbc9d 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java
index 6acb76be2..52d12d323 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java
index 92794dcc7..baa2017a5 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java
index 860fde64c..fbcccdfe1 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java
index b2e6142e9..9e70cdd64 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java
index 6d24ee822..fccd0ac82 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java
index be987d3bf..4af2d5576 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
@@ -15,7 +18,7 @@ import java.io.File;
/**
* Represents a table of contents element in the {@link EpubTask}. One should specify either a path to a NCX file or
* whether or not to generate the NCX.
- *
+ *
* @author Torkild U. Resheim
* @ant.type name="toc" category="epub"
*/
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java
index 2ef435e10..873d40840 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.ant.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties
index 6dd02f479..feca831c5 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties
+++ b/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011,2012 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/about.html b/epub/core/org.eclipse.mylyn.docs.epub.core/about.html
index da126e466..193bdda08 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/about.html
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/build.ant b/epub/core/org.eclipse.mylyn.docs.epub.core/build.ant
index 6d974a1ad..7402ad9d0 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/build.ant
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/build.ant
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2011 Torkild U. Resheim and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/build.properties b/epub/core/org.eclipse.mylyn.docs.epub.core/build.properties
index 5af5f1d20..21975a5ae 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/build.properties
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2017 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/epubcheck.xml b/epub/core/org.eclipse.mylyn.docs.epub.core/epubcheck.xml
index 7a5434375..bfa479561 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/epubcheck.xml
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/epubcheck.xml
@@ -3,9 +3,9 @@
Copyright (c) 2012, 2014 Torkild U. Resheim and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
Contributors:
Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.ant b/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.ant
index 5dd8e2df6..cd7986b02 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.ant
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.ant
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2011 Torkild U. Resheim and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.src b/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.src
index 39d14ef04..cb7cb4c94 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.src
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.src
@@ -220,4 +220,4 @@ voc Vocalist
wam Writer of accompanying material
wdc Woodcutter
wde Wood-engraver
-wit Witness \ No newline at end of file
+wit Witness
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/AllTests.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/AllTests.java
index 57e8470b2..52f2da649 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/AllTests.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/AllTests.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2015 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java
index aba4bdd96..fd0695a40 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011, 2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests.api;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java
index 41bf7e263..684a990a8 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011, 2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests.api;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java
index d8585e296..4b9be8f91 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java
@@ -2,12 +2,14 @@
* Copyright (c) 2015 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests.api;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java
index f72021ad2..d691643e3 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011, 2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests.api;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java
index aa8f047f6..dc3c4eb4b 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests.api;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
index 006d6590f..3588368a1 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014, 2017 Torkild U. Resheim and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
index 6d7ee7378..a159dae72 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014, 2017 Torkild U. Resheim and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
index a9706a070..f875cf546 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011, 2014, 2017 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
index 443fbf049..0a41aca2f 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src-test/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011, 2013, 2017 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.tests.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
index 8252eb637..6f67835df 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2015 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java
index 26d7ead3e..98e61cedc 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Torkild U. Resheim and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java
index 433cd3ac9..b973f0355 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java
@@ -1,19 +1,21 @@
/*******************************************************************************
* Copyright (c) 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.core;
/**
* Implement to provide a log consumer for the EPUB tooling.
- *
+ *
* @author Torkild U. Resheim
*/
public interface ILogger {
@@ -23,7 +25,7 @@ public interface ILogger {
/**
* Logs the specified message using the <b>INFO</b> severity.
- *
+ *
* @param message
* the message to log
*/
@@ -31,7 +33,7 @@ public interface ILogger {
/**
* Logs the specified message using the given severity.
- *
+ *
* @param message
* the message to log
* @param severity
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java
index 5333cbc6a..b045e9544 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Torkild U. Resheim and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
index 26b0c7ff3..f359dbf0f 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2015 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
index 333c8a42c..1a2b916f7 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2015 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.core;
@@ -342,8 +344,8 @@ public abstract class Publication {
}
/**
- * Adds a new date to the publication. The given instance will be represented in a format defined by
- * "Date and Time Formats" at http://www.w3.org/TR/NOTE-datetime and by ISO 8601 on which it is based.
+ * Adds a new date to the publication. The given instance will be represented in a format defined by "Date and Time
+ * Formats" at http://www.w3.org/TR/NOTE-datetime and by ISO 8601 on which it is based.
*
* @param date
* the date
@@ -355,10 +357,10 @@ public abstract class Publication {
}
/**
- * Date of publication, in the format defined by the W3C specification "<a href="http://www.w3.org/TR/NOTE-datetime
- * ">Date and Time Formats</a>" and by ISO 8601. In particular, dates without times must be represented in the form
- * YYYY[-MM[-DD]]: a required 4-digit year, an optional 2-digit month, and if the month is given, an optional
- * 2-digit day of month.
+ * Date of publication, in the format defined by the W3C specification
+ * "<a href="http://www.w3.org/TR/NOTE-datetime ">Date and Time Formats</a>" and by ISO 8601. In particular, dates
+ * without times must be represented in the form YYYY[-MM[-DD]]: a required 4-digit year, an optional 2-digit month,
+ * and if the month is given, an optional 2-digit day of month.
*
* @param value
* the date string
@@ -369,8 +371,8 @@ public abstract class Publication {
}
/**
- * Adds a new date to the publication. The given instance will be represented in a format defined by
- * "Date and Time Formats" at http://www.w3.org/TR/NOTE-datetime and by ISO 8601 on which it is based.
+ * Adds a new date to the publication. The given instance will be represented in a format defined by "Date and Time
+ * Formats" at http://www.w3.org/TR/NOTE-datetime and by ISO 8601 on which it is based.
*
* @param id
* optional identifier
@@ -395,11 +397,11 @@ public abstract class Publication {
}
/**
- * Date of publication, in the format defined by the W3C specification "<a href="http://www.w3.org/TR/NOTE-datetime
- * ">Date and Time Formats</a>" and by ISO 8601. In particular, dates without times must be represented in the form
- * YYYY[-MM[-DD]]: a required 4-digit year, an optional 2-digit month, and if the month is given, an optional
- * 2-digit day of month. The event attribute is optional, possible values may include: "creation", "publication",
- * and "modification".
+ * Date of publication, in the format defined by the W3C specification
+ * "<a href="http://www.w3.org/TR/NOTE-datetime ">Date and Time Formats</a>" and by ISO 8601. In particular, dates
+ * without times must be represented in the form YYYY[-MM[-DD]]: a required 4-digit year, an optional 2-digit month,
+ * and if the month is given, an optional 2-digit day of month. The event attribute is optional, possible values may
+ * include: "creation", "publication", and "modification".
*
* @param id
* optional identifier
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java
index e82baa4fb..52eea6f15 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java
@@ -4,10 +4,12 @@
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse License v1.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java
index bbb52d2ed..faf5eb1eb 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Torkild U. Resheim and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java
index 019ec26e9..5eb94f302 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.core;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties
index 7e3d34a30..e80eba6ee 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012-2015 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java
index d87e8af5e..bfdea32af 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011, 2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.core.wikitext;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java
index accaaed4d..0c0841b10 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011,2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.internal;
@@ -17,7 +19,7 @@ import org.xml.sax.ext.DefaultHandler2;
/**
* This abstract type should be used to form the basis for all types that are used to scan EPUB XHTML content files.
- *
+ *
* @author Torkild U. Resheim
*/
public abstract class AbstractXHTMLScanner extends DefaultHandler2 {
@@ -42,7 +44,7 @@ public abstract class AbstractXHTMLScanner extends DefaultHandler2 {
/**
* Determines whether or not the given element name represents a HTML header.
- *
+ *
* @param qName
* the element name
* @return <code>true</code> if the element is a header
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java
index af790beba..918b39c77 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2015 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.internal;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java
index 8f1f70670..658971272 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java
@@ -1,19 +1,21 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.internal;
import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
/**
- *
* @author Torkild U. Resheim
*/
public class EPUBXMLHelperImp extends XMLHelperImpl {
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java
index 293fa1b32..6655f8486 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Torkild U. Resheim
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
@@ -36,8 +38,8 @@ import org.xml.sax.SAXException;
*/
public class EclipseTocImporter {
- private static void importTocs(Publication oebps, File rootFile, Node root) throws ParserConfigurationException,
- SAXException, IOException, DOMException, URISyntaxException {
+ private static void importTocs(Publication oebps, File rootFile, Node root)
+ throws ParserConfigurationException, SAXException, IOException, DOMException, URISyntaxException {
NodeList childNodes = root.getChildNodes();
for (int i = 0; i < childNodes.getLength(); i++) {
Node node = childNodes.item(i);
@@ -82,8 +84,8 @@ public class EclipseTocImporter {
}
}
- private static void importFile(Publication oebps, File rootFile, File file) throws ParserConfigurationException,
- SAXException, IOException, DOMException, URISyntaxException {
+ private static void importFile(Publication oebps, File rootFile, File file)
+ throws ParserConfigurationException, SAXException, IOException, DOMException, URISyntaxException {
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
Document doc = dBuilder.parse(file);
@@ -104,8 +106,8 @@ public class EclipseTocImporter {
* @throws DOMException
* @throws URISyntaxException
*/
- public static void importFile(Publication oebps, File file) throws ParserConfigurationException, SAXException,
- IOException, DOMException, URISyntaxException {
+ public static void importFile(Publication oebps, File file)
+ throws ParserConfigurationException, SAXException, IOException, DOMException, URISyntaxException {
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
Document doc = dBuilder.parse(file);
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java
index 8b9cbbb90..bfb06a5fc 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java
@@ -1,12 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011,2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.internal;
@@ -23,10 +26,8 @@ import org.xml.sax.SAXException;
/**
* This type is used to scan XHTML files for information that may be used in EPUB metadata. This can be the publication
- * title, copyright and author. Some of this information can be found inside Dublin Core elements.
- *
- * XXX: Not in use yet
- *
+ * title, copyright and author. Some of this information can be found inside Dublin Core elements. XXX: Not in use yet
+ *
* @author Torkild U. Resheim
* @see http://dublincore.org/documents/dc-html/
* @see http://dublincore.org/documents/dcq-html/ (obsolete)
@@ -48,8 +49,8 @@ public final class MetadataScanner extends AbstractXHTMLScanner {
this.metadata = metadata;
}
- public static void parse(InputSource file, Metadata metadata) throws ParserConfigurationException, SAXException,
- IOException {
+ public static void parse(InputSource file, Metadata metadata)
+ throws ParserConfigurationException, SAXException, IOException {
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
@@ -66,4 +67,4 @@ public final class MetadataScanner extends AbstractXHTMLScanner {
return metadata;
}
-} \ No newline at end of file
+}
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java
index 90838d55f..32ed6f278 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2014 Torkild U. Resheim
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
@@ -43,8 +45,8 @@ public class OPSValidator extends DefaultHandler {
WARN
}
- public static String clean(InputSource file, String href) throws ParserConfigurationException, SAXException,
- IOException {
+ public static String clean(InputSource file, String href)
+ throws ParserConfigurationException, SAXException, IOException {
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
@@ -60,8 +62,8 @@ public class OPSValidator extends DefaultHandler {
return null;
}
- public static List<ValidationMessage> validate(InputSource file, String href) throws ParserConfigurationException,
- SAXException, IOException {
+ public static List<ValidationMessage> validate(InputSource file, String href)
+ throws ParserConfigurationException, SAXException, IOException {
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
@@ -96,12 +98,11 @@ public class OPSValidator extends DefaultHandler {
* @see http://idpf.org/epub/20/spec/OPS_2.0.1_draft.htm#Section2.2
*/
@SuppressWarnings("nls")
- private final String[] legalElements = new String[] { "body", "head", "html", "title", "abbr", "acronym",
- "address", "blockquote", "br", "cite", "code", "dfn", "div", "em", "h1", "h2", "h3", "h4", "h5", "h6",
- "kbd", "p", "pre", "q", "samp", "span", "strong", "var", "a", "dl", "dt", "dd", "ol", "ul", "li", "object",
- "param", "b", "big", "hr", "i", "small", "sub", "sup", "tt", "del", "ins", "bdo", "caption", "col",
- "colgroup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "img", "area", "map", "style", "link",
- "base" };
+ private final String[] legalElements = new String[] { "body", "head", "html", "title", "abbr", "acronym", "address",
+ "blockquote", "br", "cite", "code", "dfn", "div", "em", "h1", "h2", "h3", "h4", "h5", "h6", "kbd", "p",
+ "pre", "q", "samp", "span", "strong", "var", "a", "dl", "dt", "dd", "ol", "ul", "li", "object", "param",
+ "b", "big", "hr", "i", "small", "sub", "sup", "tt", "del", "ins", "bdo", "caption", "col", "colgroup",
+ "table", "tbody", "td", "tfoot", "th", "thead", "tr", "img", "area", "map", "style", "link", "base" };
private final ArrayList<ValidationMessage> messages;
@@ -229,10 +230,10 @@ public class OPSValidator extends DefaultHandler {
contents.append('>');
recording = true;
if (!isLegalElement(qName)) {
- messages.add(new ValidationMessage(Severity.WARNING, MessageFormat.format(
- "Element \"{0}\" in file \"{1}\" is not in OPS Preferred Vocabularies", qName, href))); //$NON-NLS-1$
+ messages.add(new ValidationMessage(Severity.WARNING, MessageFormat
+ .format("Element \"{0}\" in file \"{1}\" is not in OPS Preferred Vocabularies", qName, href))); //$NON-NLS-1$
}
}
}
-} \ No newline at end of file
+}
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java
index f2887be7c..c2765db75 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.internal;
@@ -29,7 +31,7 @@ import org.xml.sax.SAXException;
/**
* This type is a SAX parser that will read a XHTML file and create a list of all images, content and CSS-files that are
* referenced either through an <i>img<i/> tag or a link.
- *
+ *
* @author Torkild U. Resheim
*/
public class ReferenceScanner extends AbstractXHTMLScanner {
@@ -65,7 +67,7 @@ public class ReferenceScanner extends AbstractXHTMLScanner {
/**
* Case-insensitive method for obtaining an attribute.
- *
+ *
* @param attributes
* SAX attributes
* @param name
@@ -147,4 +149,4 @@ public class ReferenceScanner extends AbstractXHTMLScanner {
files.add(file);
}
}
-} \ No newline at end of file
+}
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java
index 2e9c20d69..7ce2a20c1 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java
+++ b/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2017 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.docs.epub.internal;
@@ -147,4 +149,4 @@ public class TOCGenerator extends AbstractXHTMLScanner {
return tocGenerator.getPlayOrder();
}
-} \ No newline at end of file
+}
diff --git a/epub/core/pom.xml b/epub/core/pom.xml
index 3e9d6d512..df9b809bb 100644
--- a/epub/core/pom.xml
+++ b/epub/core/pom.xml
@@ -143,8 +143,8 @@
<licenses>
<license>
- <name>Eclipse Public License Version 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ <name>Eclipse Public License Version 2.0</name>
+ <url>https://www.eclipse.org/legal/epl-2.0/</url>
<distribution>repo</distribution>
</license>
</licenses>
diff --git a/epub/pom.xml b/epub/pom.xml
index 9371303b7..4d921affc 100644
--- a/epub/pom.xml
+++ b/epub/pom.xml
@@ -28,8 +28,8 @@
<licenses>
<license>
- <name>Eclipse Public License Version 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ <name>Eclipse Public License Version 2.0</name>
+ <url>https://www.eclipse.org/legal/epl-2.0/</url>
<distribution>repo</distribution>
</license>
</licenses>
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/build.properties b/epub/ui/org.eclipse.mylyn.docs.epub-feature/build.properties
index 01a31d2a7..3dbeef9fc 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub-feature/build.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2014 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.properties b/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.properties
index ee97fec92..dc5df8404 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2017 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml b/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml
index 2e0dc5529..ac6cc83d7 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml
+++ b/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml
@@ -6,7 +6,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.docs.epub.ui"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/about.html b/epub/ui/org.eclipse.mylyn.docs.epub.help/about.html
index da126e466..193bdda08 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/about.html
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/book.css b/epub/ui/org.eclipse.mylyn.docs.epub.help/book.css
index fef2a5154..05781e38b 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/book.css
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/book.css
@@ -6,4 +6,4 @@ pre {
code {
font-size: 100%;
-} \ No newline at end of file
+}
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant b/epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant
index ee6de52b8..c4d88e5f8 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2014, 2017 Torkild U. Resheim
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Torkild U. Resheim - initial API and implementation
@@ -40,4 +42,4 @@
</epub>
</target>
-</project> \ No newline at end of file
+</project>
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant b/epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant
index 5e100b6f7..5b8eeb543 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009, 2017 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/build.properties b/epub/ui/org.eclipse.mylyn.docs.epub.help/build.properties
index 5fbad7baa..a5779adf4 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/build.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2017 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/style.css b/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/style.css
index 9e61ccad9..5b4657a1b 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/style.css
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/style.css
@@ -2,9 +2,9 @@
* Copyright (c) 2011, 2012 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/plugin.properties b/epub/ui/org.eclipse.mylyn.docs.epub.help/plugin.properties
index a8a56ab1e..c59cb79ff 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/plugin.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/plugin.properties
@@ -1,13 +1,15 @@
###############################################################################
# Copyright (c) 2012 2017 Torkild U. Resheim.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
###############################################################################
#Properties file for org.eclipse.mylyn.docs.epub.help
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Eclipse EPUB Tools Help and User Guide \ No newline at end of file
+Bundle-Name.0 = Eclipse EPUB Tools Help and User Guide
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/toc.xml b/epub/ui/org.eclipse.mylyn.docs.epub.help/toc.xml
index 2ed5043cb..1787ff06a 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/toc.xml
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.help/toc.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/build.properties b/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/build.properties
index 1ce068409..1f6bb9755 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/build.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2014 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.properties b/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.properties
index 1b429b0b1..48a0923a2 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013, 2017 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.xml b/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.xml
index 48ff8a629..82a4001fd 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.xml
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.xml
@@ -1,4 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2018 Torkild U. Resheim
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ Torkild U. Resheim - initial API and implementation
+ -->
<feature
id="org.eclipse.mylyn.docs.epub.sdk"
label="%featureName"
@@ -6,7 +18,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.docs.epub.ui"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/about.html b/epub/ui/org.eclipse.mylyn.docs.epub.ui/about.html
index da126e466..193bdda08 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/about.html
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/build.properties b/epub/ui/org.eclipse.mylyn.docs.epub.ui/build.properties
index e5fde67f0..e641c9c7c 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/build.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2017 Torkild U. Resheim
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/plugin.properties b/epub/ui/org.eclipse.mylyn.docs.epub.ui/plugin.properties
index d42de03bd..819c7890b 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/plugin.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2017 Torkild U. Resheim.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
@@ -12,4 +14,4 @@
Bundle-Vendor.0 = Eclipse Mylyn
Bundle-Name.0 = Eclipse EPUB Tools
command.name = Generate EPUB
-command.label = Generate EPUB... \ No newline at end of file
+command.label = Generate EPUB...
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java
index 9eafc4280..a2f885af3 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java
@@ -2,12 +2,14 @@
* Copyright (c) 2011-2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Torkild U. Resheim - initial API and implementation
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.internal.docs.epub.ui;
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java
index 56069451c..fcaa29c5d 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java
@@ -1,11 +1,15 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Torkild U. Resheim.
- *
+ *
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse License v1.0 which accompanies this
- * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Torkild U. Resheim - initial API and implementation
+ * available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.internal.docs.epub.ui;
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java
index e886b5ee7..2fbec0e3b 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java
@@ -2,9 +2,11 @@
* Copyright (c) 2011-2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Torkild U. Resheim - initial API and implementation
@@ -82,7 +84,8 @@ public class MainPage extends WizardPage {
public MainPage() {
super("wizardPage"); //$NON-NLS-1$
setMessage(Messages.MainPage_0);
- setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(EPUBUIPlugin.PLUGIN_ID, "icons/wizard-banner.png")); //$NON-NLS-1$
+ setImageDescriptor(
+ AbstractUIPlugin.imageDescriptorFromPlugin(EPUBUIPlugin.PLUGIN_ID, "icons/wizard-banner.png")); //$NON-NLS-1$
setTitle(Messages.MainPage_1);
}
@@ -224,8 +227,8 @@ public class MainPage extends WizardPage {
public StringValidator(String errorText, Control control) {
this.errorText = errorText;
controlDecoration = new ControlDecoration(control, SWT.LEFT | SWT.TOP);
- FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
- FieldDecorationRegistry.DEC_REQUIRED);
+ FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault()
+ .getFieldDecoration(FieldDecorationRegistry.DEC_REQUIRED);
controlDecoration.setImage(fieldDecoration.getImage());
}
@@ -254,8 +257,8 @@ public class MainPage extends WizardPage {
this.errorText = errorText;
this.fileSuffixes = fileSuffixes;
controlDecoration = new ControlDecoration(control, SWT.LEFT | SWT.TOP);
- FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
- FieldDecorationRegistry.DEC_ERROR);
+ FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault()
+ .getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
controlDecoration.setImage(fieldDecoration.getImage());
controlDecoration.hide();
}
@@ -307,7 +310,8 @@ public class MainPage extends WizardPage {
IObservableValue text_4ObserveTextObserveWidget = SWTObservables.observeText(identifierText, SWT.Modify);
final IObservableValue beanIdentifierObserveValue = PojoObservables.observeValue(bean, "identifier"); //$NON-NLS-1$
UpdateValueStrategy identifierStrategy = new UpdateValueStrategy(UpdateValueStrategy.POLICY_UPDATE);
- identifierStrategy.setBeforeSetValidator(new StringValidator("An identifier must be specified", identifierText)); //$NON-NLS-1$
+ identifierStrategy
+ .setBeforeSetValidator(new StringValidator("An identifier must be specified", identifierText)); //$NON-NLS-1$
bindingContext.bindValue(text_4ObserveTextObserveWidget, beanIdentifierObserveValue, identifierStrategy, null);
//
IObservableValue schemeTextObserveTextObserveWidget = SWTObservables.observeText(schemeText);
@@ -339,16 +343,17 @@ public class MainPage extends WizardPage {
UpdateValueStrategy coverStrategy = new UpdateValueStrategy(UpdateValueStrategy.POLICY_UPDATE);
coverStrategy.setBeforeSetValidator(new FileValidator(
"The cover image must be a valid image file of type PNG, SVG or JPEG.", coverText, new String[] { //$NON-NLS-1$
- ".png", ".svg", ".jpeg", ".jpg" })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ ".png", ".svg", ".jpeg", ".jpg" })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
bindingContext.bindValue(coverObserveTextObserveWidget, beanCoverObserveValue, coverStrategy, null);
//
- IObservableValue styleSheetTextObserveTextObserveWidget = SWTObservables.observeText(styleSheetText, SWT.Modify);
+ IObservableValue styleSheetTextObserveTextObserveWidget = SWTObservables.observeText(styleSheetText,
+ SWT.Modify);
IObservableValue beanStyleSheetObserveValue = PojoObservables.observeValue(bean, "styleSheet"); //$NON-NLS-1$
UpdateValueStrategy styleSheetStrategy = new UpdateValueStrategy(UpdateValueStrategy.POLICY_UPDATE);
styleSheetStrategy.setBeforeSetValidator(new FileValidator("The style sheet must be a valid CSS file.", //$NON-NLS-1$
styleSheetText, new String[] { ".css" })); //$NON-NLS-1$
- bindingContext.bindValue(styleSheetTextObserveTextObserveWidget, beanStyleSheetObserveValue,
- styleSheetStrategy, null);
+ bindingContext.bindValue(styleSheetTextObserveTextObserveWidget, beanStyleSheetObserveValue, styleSheetStrategy,
+ null);
//
return bindingContext;
}
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java
index 755f5fc0d..3a02d02e5 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java
@@ -2,12 +2,15 @@
* Copyright (c) 2011-2014 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
*
- * Contributors: Torkild U. Resheim - initial API and implementation
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Torkild U. Resheim - initial API and implementation
+ */
package org.eclipse.mylyn.internal.docs.epub.ui;
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java
index 81f492283..f425289fd 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java
@@ -2,9 +2,11 @@
* Copyright (c) 2011, 2012 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: Torkild U. Resheim - initial API and implementation
*******************************************************************************/
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java
index 12157c695..8d84bd843 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java
@@ -2,9 +2,11 @@
* Copyright (c) 2011, 2012 Torkild U. Resheim.
*
* All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License v2.0 which
* accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: Torkild U. Resheim - initial API and implementation
*******************************************************************************/
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties
index 4cd659a0f..870cd8d7d 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2012 Torkild U. Resheim and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties
index 0a0aa8aa1..02462345a 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties
+++ b/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011-2014 Torkild U. Resheim and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Torkild U. Resheim - initial API and implementation
diff --git a/epub/ui/targets/epub.target-template b/epub/ui/targets/epub.target-template
index 28d6a2153..d169811f6 100644
--- a/epub/ui/targets/epub.target-template
+++ b/epub/ui/targets/epub.target-template
@@ -57,7 +57,7 @@
<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<unit id="org.eclipse.license.feature.group" version="2.0.0.v20180130-0820"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.ant/about.html
index da126e466..193bdda08 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/MarkupTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/MarkupTask.java
index 763499537..4a6e85420 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/MarkupTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/MarkupTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTask.java
index c130553d0..a4a4041a4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2013 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTask.java
index d20bf238a..62a104245 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTask.java
index 921b460fd..242088379 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTask.java
index 196be1cf7..666c88eae 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTask.java
index 89d247a76..bbda1c57a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTask.java
index 90622be7f..7c89f6c8d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/Messages.java
index 3275df071..d1f6e7767 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/messages.properties
index 87b90deeb..4f5407fa1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/package-info.java
index 929d78d0c..c3b9510bc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/internal/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/package-info.java
index 22459fb73..79f24d39f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/tasks.properties b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/tasks.properties
index f52b052e8..738998e86 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/tasks.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/main/java/org/eclipse/mylyn/wikitext/ant/tasks.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/AbstractTestAntTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/AbstractTestAntTask.java
index 2381f6fa3..5fa01e111 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/AbstractTestAntTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/AbstractTestAntTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java
index d346d2a0a..1c19912bf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2013 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java
index 9a79b521a..a8600d9f9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java
index 3460221dc..b52feee14 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java
index 1e82a3784..afa2d4c8d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTaskTest.java
index d160d8852..07a5d59d4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToHtmlTaskTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java
index 2ba324d17..5dacb80cb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/about.html
index 7b792eeba..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 24, 2011</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/plugin.properties
index bdac092b0..837de7e52 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2015 Max Rydahl Andersen and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Max Rydahl Andersen - copied from markdown to get base for asciidoc
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocLanguage.java
index 71aeb304f..96884624a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2016 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocMarkupLanguageConfiguration.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocMarkupLanguageConfiguration.java
index 6f1eb7c32..4e430bea9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocMarkupLanguageConfiguration.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/AsciiDocMarkupLanguageConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocContentState.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocContentState.java
index 818643cf9..b20bd88a0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocContentState.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocContentState.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocDocumentBuilder.java
index 40883176b..5773cd93f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - copied from MarkdownDocumentBuilder and adapted to AsciiDoc
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategy.java
index 1a5cf50d9..7212ef681 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AsciiDocBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AsciiDocBlock.java
index dc31be8e7..faa827c1c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AsciiDocBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AsciiDocBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - Bug 474084: initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AttributeDefinitionBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AttributeDefinitionBlock.java
index 37ce8884f..a87a7a584 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AttributeDefinitionBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/AttributeDefinitionBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CodeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CodeBlock.java
index 4c96cdca4..d8320fb67 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CodeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CodeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - Bug 474084: initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CommentBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CommentBlock.java
index 924a45b9b..f3599816f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CommentBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/CommentBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/DefinitionListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/DefinitionListBlock.java
index e91435598..f3b5bd55e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/DefinitionListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/DefinitionListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 Fabrizio Iannetti and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Fabrizio Iannetti - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HeadingBlock.java
index be25a2579..872be2979 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HorizontalRuleBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HorizontalRuleBlock.java
index 39ab997a3..64050e1fe 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HorizontalRuleBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/HorizontalRuleBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/InlineHtmlBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/InlineHtmlBlock.java
index 998bc0931..4294a0f57 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/InlineHtmlBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/InlineHtmlBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ListBlock.java
index ceb3178cf..488979b08 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Patrik Suzzi and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Patrik Suzzi - Bug 481670 - [asciidoc] support for lists
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ParagraphBlock.java
index 33d2011fb..f9f567de2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PreformattedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PreformattedBlock.java
index c49ced65b..247a848c3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PreformattedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PreformattedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PropertiesLineBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PropertiesLineBlock.java
index ce2669213..7da4f6cc4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PropertiesLineBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/PropertiesLineBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TableBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TableBlock.java
index c2bf67e67..71fac7a65 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TableBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TableBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TitleLineBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TitleLineBlock.java
index aa9ecb807..8fe5f9845 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TitleLineBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/TitleLineBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/UnderlinedHeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/UnderlinedHeadingBlock.java
index 94b230723..a8fd24204 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/UnderlinedHeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/block/UnderlinedHeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/BackslashEscapePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/BackslashEscapePhraseModifier.java
index ba55a584c..3092d84d7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/BackslashEscapePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/BackslashEscapePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/CssClassPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/CssClassPhraseModifier.java
index e6adccd05..5899d601c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/CssClassPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/CssClassPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/SimplePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/SimplePhraseModifier.java
index b89eaa930..19c69adf5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/SimplePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/phrase/SimplePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AbstractAsciidocMacroReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AbstractAsciidocMacroReplacementToken.java
index f4373454f..36b8bb81f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AbstractAsciidocMacroReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AbstractAsciidocMacroReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkMacroReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkMacroReplacementToken.java
index 7eaf882ec..7a94d1a28 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkMacroReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkMacroReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
@@ -26,4 +28,4 @@ public class AnchorLinkMacroReplacementToken extends AbstractAsciidocMacroReplac
protected PatternBasedElementProcessor newProcessor() {
return new AnchorLinkReplacementTokenProcessor();
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementToken.java
index 0b73a5a27..45bd9e253 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementTokenProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementTokenProcessor.java
index 3e6374106..5d7ead110 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementTokenProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/AnchorLinkReplacementTokenProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
@@ -24,4 +26,4 @@ class AnchorLinkReplacementTokenProcessor extends PatternBasedElementProcessor {
attribute.setId(group(1));
builder.link(attribute, null, ""); //$NON-NLS-1$
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/EmailLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/EmailLinkReplacementToken.java
index be626a019..2f46bf3b3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/EmailLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/EmailLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen- initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ExplicitLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ExplicitLinkReplacementToken.java
index 5796e7a15..ab93775c3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ExplicitLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ExplicitLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen- initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitFormattedLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitFormattedLinkReplacementToken.java
index 6cac9d383..d303cbae9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitFormattedLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitFormattedLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen- initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitLinkReplacementToken.java
index 4cb45b102..0c0165ef7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/ImplicitLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen- initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineAttributeReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineAttributeReplacementToken.java
index 066a0796f..ec790c680 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineAttributeReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineAttributeReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineCommentReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineCommentReplacementToken.java
index eea033844..b97f3fbaa 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineCommentReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineCommentReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen- initial API and implementation, Bug 474084
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineEscapedAttributeReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineEscapedAttributeReplacementToken.java
index bfc5cb152..8df47d7f6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineEscapedAttributeReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineEscapedAttributeReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineImageReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineImageReplacementToken.java
index c2eec58d6..63694b8c3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineImageReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/InlineImageReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - initial API and implementation, Bug 474084
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/PreserverHtmlEntityToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/PreserverHtmlEntityToken.java
index 0b4db4a24..e46336c83 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/PreserverHtmlEntityToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/PreserverHtmlEntityToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefMacroReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefMacroReplacementToken.java
index 69645a3a4..e391be967 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefMacroReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefMacroReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
@@ -26,4 +28,4 @@ public class XrefMacroReplacementToken extends AbstractAsciidocMacroReplacementT
protected PatternBasedElementProcessor newProcessor() {
return new XrefReplacementTokenProcessor(0);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementToken.java
index 1573ad1ed..b395a6ef7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementTokenProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementTokenProcessor.java
index 4c0b1e3ea..a5ac838e5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementTokenProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/token/XrefReplacementTokenProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
@@ -74,4 +76,4 @@ class XrefReplacementTokenProcessor extends PatternBasedElementProcessor {
private String linkTextCaptureGroup() {
return group(2);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LanguageSupport.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LanguageSupport.java
index a01502dad..a51c03912 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LanguageSupport.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LanguageSupport.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydhal Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LookAheadReader.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LookAheadReader.java
index 310e9dbb0..27b261a09 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LookAheadReader.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/LookAheadReader.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadBlock.java
index 63c06c2bc..a571423d0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadDispatcher.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadDispatcher.java
index 2b198838c..c0ca27e58 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadDispatcher.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/main/java/org/eclipse/mylyn/wikitext/asciidoc/internal/util/ReadAheadDispatcher.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2016 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocDocumentBuilderTest.java
index 7890a67ce..65b29481a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - copied from MarkdownDocumentBuilderTest and adapted to AsciiDoc
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAnchorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAnchorTest.java
index e2c28ac04..c01379bd7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAnchorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAnchorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAttributeTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAttributeTest.java
index 33713569b..c0a2a020b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAttributeTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageAttributeTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - copied from markdown to get base for asciidoc
@@ -157,4 +159,4 @@ public class AsciiDocLanguageAttributeTest extends AsciiDocLanguageTestBase {
String html = parseToHtml(":number: three\nIs {number} higher? {set:number!}Because {number} is");
assertEquals("<p>Is three higher? Because {number} is</p>\n", html);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageBlockElementsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageBlockElementsTest.java
index cb47104f5..39bcfc25a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageBlockElementsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageBlockElementsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2016 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCodeBlockElementsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCodeBlockElementsTest.java
index 02e246188..64361e8f1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCodeBlockElementsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCodeBlockElementsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - Bug 474084: initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCommentBlockElementsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCommentBlockElementsTest.java
index 2495f1bd0..7a916a6e3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCommentBlockElementsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageCommentBlockElementsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - Bug 474084: initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageHorizontalRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageHorizontalRuleTest.java
index 3001e4d3a..97f808665 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageHorizontalRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageHorizontalRuleTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageImageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageImageTest.java
index 367ff3362..134707857 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageImageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageImageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - copied from markdown to get base for asciidoc
@@ -158,4 +160,4 @@ public class AsciiDocLanguageImageTest extends AsciiDocLanguageTestBase {
assertEquals(expected, html);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageLinksTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageLinksTest.java
index 74a6c634f..cf7b986ac 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageLinksTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageLinksTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - copied from markdown to get base for asciidoc
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageListTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageListTest.java
index 034732239..d1f4c6416 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageListTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageListTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Patrik Suzzi and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Patrik Suzzi - Bug 481670 - [asciidoc] support for lists
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageMiscellaneousTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageMiscellaneousTest.java
index 5bc4ce2c4..11f2d4164 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageMiscellaneousTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageMiscellaneousTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - copied from markdown to get base for asciidoc, Bug 474084
@@ -179,4 +181,4 @@ public class AsciiDocLanguageMiscellaneousTest extends AsciiDocLanguageTestBase
String html = parseToHtml(":attr: 42");
assertEquals("", html);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguagePreformattedBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguagePreformattedBlockTest.java
index 4b317c436..95584a720 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguagePreformattedBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguagePreformattedBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSpanElementsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSpanElementsTest.java
index 8931e3dd2..e4d667d5e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSpanElementsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSpanElementsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - copied from markdown to get base for asciidoc
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSupportTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSupportTest.java
index cd7d6f4cf..2c2f2fbce 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSupportTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSupportTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTableTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTableTest.java
index 3c741188b..94a6b423a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTableTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTableTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTest.java
index f1d17cb85..b48752218 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTestBase.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTestBase.java
index ee319c630..5fb5185dc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTestBase.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageTestBase.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen - copied from markdown to get base for asciidoc, Bug 474084
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageWithConfigurationIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageWithConfigurationIntegrationTest.java
index 0ff9b290f..5569c74cc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageWithConfigurationIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageWithConfigurationIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageXrefTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageXrefTest.java
index cc50f3443..40a0708e2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageXrefTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageXrefTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategyTest.java
index 637c2361a..c8ab0e808 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.asciidoc/src/test/java/org/eclipse/mylyn/wikitext/asciidoc/internal/AsciiDocIdGenerationStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguage.java
index 5d629c2f1..23b961551 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMark.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMark.java
index 173d3338a..8885e3ea5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMark.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMark.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategy.java
index 612a45fcc..e93e3e9f5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ContentLineSequence.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ContentLineSequence.java
index 9acc05aeb..e60b6c1f2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ContentLineSequence.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ContentLineSequence.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -88,4 +90,4 @@ class ContentLineSequence extends ForwardLineSequence {
public LineSequence lookAhead() {
return new LookAheadLineSequence(this);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/InlineContent.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/InlineContent.java
index f9d9731f6..d5c96c198 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/InlineContent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/InlineContent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/Line.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/Line.java
index 915ef1372..90ab48600 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/Line.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/Line.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicates.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicates.java
index d09768d21..467b0ae53 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicates.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicates.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequence.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequence.java
index 2343d136d..650c4244d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequence.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequence.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterable.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterable.java
index c6b8de71a..449671246 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterable.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterable.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LookAheadLineSequence.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LookAheadLineSequence.java
index 986ef247c..e21f3f457 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LookAheadLineSequence.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/LookAheadLineSequence.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -64,4 +66,4 @@ class LookAheadLineSequence extends LineSequence {
return new LookAheadLineSequence(this);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequence.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequence.java
index 2bfda5d7e..2eed241ac 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequence.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequence.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContext.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContext.java
index 4b09f850d..013129be8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContext.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContext.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextBuilder.java
index 7eef74835..2038f349d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocator.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocator.java
index 5f1fa2dcd..3b66bc4de 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocator.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlock.java
index d130f122a..c2885b83a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocks.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocks.java
index fddef3307..dd6287d17 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocks.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocks.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegment.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegment.java
index b4a9cc258..e6c9c2c9f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegment.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegment.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelper.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelper.java
index dfb7fcdb0..29f465c52 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelper.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelper.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequence.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequence.java
index d4a7b0de9..33e7d139a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequence.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequence.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AbstractHtmlBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AbstractHtmlBlock.java
index cf0539ec9..e0f3b3a09 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AbstractHtmlBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AbstractHtmlBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlock.java
index e26b96687..f7e7cfb3e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlock.java
index 1eee31231..3bea7d08f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockWithNestedBlocks.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockWithNestedBlocks.java
index 31801a9c1..f98c8e1d2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockWithNestedBlocks.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockWithNestedBlocks.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlock.java
index 6d6a2f3d3..44884ea62 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlock.java
index 323f4cc55..c3dfd03d9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlock.java
index c1a524cfa..58e3a0c07 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlock.java
index c58cecbb8..8ef33a4a2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCdataBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCdataBlock.java
index 78831d029..e3047d4d2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCdataBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCdataBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlock.java
index cae23f033..e6c316484 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlDoctypeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlDoctypeBlock.java
index 993906f42..2dfc46379 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlDoctypeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlDoctypeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlProcessingInstructionBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlProcessingInstructionBlock.java
index d6382a2a3..dccf99edd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlProcessingInstructionBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlProcessingInstructionBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1Block.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1Block.java
index ed7be3d9e..a31a1032d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1Block.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1Block.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType7Block.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType7Block.java
index 291fa280a..5eab99f99 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType7Block.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType7Block.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlock.java
index 35caf16d4..596a87376 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlock.java
index a83fe710b..434c1f8a7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlock.java
index c357e60bb..d16262417 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlock.java
index 167c899d6..8c08c76a9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AllCharactersSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AllCharactersSpan.java
index 0e6fa4b4a..2a9117727 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AllCharactersSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AllCharactersSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpan.java
index e308b5a7f..4f2f3afa9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpan.java
index 610610cc9..ff89a6823 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpan.java
index d3889c35c..12d4df6a7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Characters.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Characters.java
index e84f89f73..c497539b0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Characters.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Characters.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Code.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Code.java
index c34acbe68..dd7007c39 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Code.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Code.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpan.java
index 44371540b..0416be6e8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursor.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursor.java
index 9124b57b8..f939516f0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Emphasis.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Emphasis.java
index b5699f245..03794e2e7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Emphasis.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Emphasis.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/EscapedCharacter.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/EscapedCharacter.java
index 05b781aad..b8c07d9f7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/EscapedCharacter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/EscapedCharacter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HardLineBreak.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HardLineBreak.java
index 1a3996554..e37a864b3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HardLineBreak.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HardLineBreak.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntity.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntity.java
index dc5e76c49..5962e3903 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntity.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntity.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpan.java
index a91f19ea9..c3ec3bc1e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTag.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTag.java
index 37ff6c226..64a64f17f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTag.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTag.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpan.java
index 968a4d03f..211b55bd8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Image.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Image.java
index e7235a1f3..088bd4cfe 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Image.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Image.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Inline.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Inline.java
index 2ecebf332..1563c5407 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Inline.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Inline.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParser.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParser.java
index 4e5dd1bb1..e37b94c05 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithNestedContents.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithNestedContents.java
index 53001b32b..5842507c6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithNestedContents.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithNestedContents.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithText.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithText.java
index b3b3f5eeb..41ad1a532 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithText.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineWithText.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlinesSubstitution.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlinesSubstitution.java
index be8003d32..23d304825 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlinesSubstitution.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlinesSubstitution.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpan.java
index 7fef0a54c..3c3f09019 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Link.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Link.java
index 564f9fe56..76c95da56 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Link.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Link.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketDelimiter.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketDelimiter.java
index 3c69320b8..15aeeacd4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketDelimiter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketDelimiter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiter.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiter.java
index cd7f76c82..22bade18a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpan.java
index 83f07e2a5..7d88f2042 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisDelimiter.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisDelimiter.java
index db232e474..6fb97ba0f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisDelimiter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisDelimiter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpan.java
index 9f99362d0..25ab24325 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/ReferenceDefinition.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/ReferenceDefinition.java
index 6a79ea7ff..f1288448b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/ReferenceDefinition.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/ReferenceDefinition.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SoftLineBreak.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SoftLineBreak.java
index 2b7292d77..f8c8791a0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SoftLineBreak.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SoftLineBreak.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SourceSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SourceSpan.java
index 77aa0ca1c..8483570ec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SourceSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/SourceSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpan.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpan.java
index 41b6981d0..0eff6b034 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpan.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpan.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Strong.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Strong.java
index 74e2eadff..a762a5e23 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Strong.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Strong.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageDocumentOffsetsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageDocumentOffsetsTest.java
index fa4ff6a31..1443bb8bd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageDocumentOffsetsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageDocumentOffsetsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageTest.java
index 4e4480b8f..fe2e44cdf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/CommonMarkLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkAsserts.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkAsserts.java
index 6f0e79575..195b10b85 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkAsserts.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkAsserts.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategyTest.java
index e6da9ca6a..2e6517ac2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/CommonMarkIdGenerationStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicatesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicatesTest.java
index ce06b9d60..78c1ac4d1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicatesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinePredicatesTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequenceTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequenceTest.java
index 578f1e85a..7f9793f93 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequenceTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineSequenceTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineTest.java
index 1d3a860d8..b46691a97 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterableTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterableTest.java
index da0bd1f08..66f1166ff 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterableTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LinesIterableTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequenceTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequenceTest.java
index 4c2ea6674..32ac59458 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequenceTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/PredicateLineSequenceTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextTest.java
index 9d6ffde0e..e9058cb1a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ProcessingContextTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocatorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocatorTest.java
index 2d605e445..ab225111c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocatorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocatorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocksTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocksTest.java
index b38652161..e41b0a7fb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocksTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SourceBlocksTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegmentTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegmentTest.java
index cfb8206e0..49061bff5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegmentTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TextSegmentTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelperTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelperTest.java
index ca141938a..a95acca45 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelperTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/ToStringHelperTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequenceTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequenceTest.java
index a979f36df..eef8a1099 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequenceTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/TransformLineSequenceTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlockTest.java
index 7697b7140..3fed1e347 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/AtxHeaderBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlockTest.java
index 61229561b..1e8accbf7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/BlockQuoteBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlockTest.java
index 0d175c26d..bb96fdf64 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/EmptyBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlockTest.java
index 3dc93252b..7966ced7d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/FencedCodeBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlockTest.java
index fd064ac23..3a5922e37 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HorizontalRuleBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlockTest.java
index 578602c65..01967c43e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlockTest.java
index 32dc5d97f..9bd7ec5fe 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlCommentBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1BlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1BlockTest.java
index 0351b04b7..7f205ee49 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1BlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/HtmlType1BlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlockTest.java
index f508100ce..fbd5e6904 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/IndentedCodeBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlockTest.java
index 136a6d8e5..8bb75b893 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ListBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlockTest.java
index 59cebdedb..8f20dedd3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/ParagraphBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlockTest.java
index 4efd0c2bb..960b1423c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/blocks/SetextHeaderBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AbstractSourceSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AbstractSourceSpanTest.java
index 30a52fd21..dfa65ab8e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AbstractSourceSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AbstractSourceSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpanTest.java
index 9fc532897..a98339427 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpanTest.java
index 5c56dd8ca..1ed0ca08c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/AutoLinkWithoutDemarcationSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpanTest.java
index 9170300cb..5e9beaf13 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/BackslashEscapeSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpanTest.java
index 46bd2877f..d08149270 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CodeSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CursorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CursorTest.java
index 906498e2b..c12d859f4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CursorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/CursorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursors.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursors.java
index 514c94674..17cac8c50 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursors.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/Cursors.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpanTest.java
index bda9caebf..9dedd5eb7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlEntitySpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpanTest.java
index df75f5ef7..ef1c342c5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/HtmlTagSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParserTest.java
index 572de24c2..9f35e7141 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineTest.java
index 1fb333ade..9252fcff2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpanTest.java
index f4b14d8d1..029c53f60 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/LineBreakSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiterTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiterTest.java
index b006d0231..9cdb619ca 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiterTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketEndDelimiterTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpanTest.java
index 149b040f6..338069ffa 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialBracketSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpanTest.java
index 67e11f199..8d6c1279a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/PotentialEmphasisSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpanTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpanTest.java
index 630b58dc0..f1c420529 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpanTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/StringCharactersSpanTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/CommonMarkSpecTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/CommonMarkSpecTest.java
index 844eaa225..129b81c59 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/CommonMarkSpecTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/CommonMarkSpecTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/SimplifiedHtmlDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/SimplifiedHtmlDocumentBuilder.java
index 5f4982df4..a8ee1b53f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/SimplifiedHtmlDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.commonmark/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/spec/SimplifiedHtmlDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/plugin.properties
index da0800992..ec5b46678 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 Mylyn project committers and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -11,4 +13,4 @@
#Properties file for org.eclipse.mylyn.wikitext.confluence
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText Confluence \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText Confluence
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguage.java
index a1a68e400..deb62727a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceContentState.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceContentState.java
index 46fbd3aa2..f74cd5007 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceContentState.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceContentState.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilder.java
index 118e30eb3..9adf696bc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2017 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/AbstractConfluenceDelimitedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/AbstractConfluenceDelimitedBlock.java
index 4bcf37807..21c347f00 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/AbstractConfluenceDelimitedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/AbstractConfluenceDelimitedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/CodeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/CodeBlock.java
index 5f83b3412..ce6cd315f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/CodeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/CodeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ColorBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ColorBlock.java
index addd9f1f2..1c2ee73af 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ColorBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ColorBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedPreformattedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedPreformattedBlock.java
index 0a9291b66..152825362 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedPreformattedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedPreformattedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -51,4 +53,4 @@ public class ExtendedPreformattedBlock extends AbstractConfluenceDelimitedBlock
// no options
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedQuoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedQuoteBlock.java
index 1c093f09e..041af8154 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedQuoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ExtendedQuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/HeadingBlock.java
index 290d047f4..0e55f75d5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ListBlock.java
index 7feddb0f9..14f85cd1b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParagraphBlock.java
index 3bbec375c..8b4247549 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParameterizedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParameterizedBlock.java
index dca71c9a4..ebfd65097 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParameterizedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/ParameterizedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/QuoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/QuoteBlock.java
index 0a23b1f36..da313dfb4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/QuoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/QuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableBlock.java
index 369aa8758..0570e1fc1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableOfContentsBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableOfContentsBlock.java
index 4067f1d83..27d184046 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableOfContentsBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TableOfContentsBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TextBoxBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TextBoxBlock.java
index 1ae1e7475..f5947a3eb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TextBoxBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/block/TextBoxBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ColorPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ColorPhraseModifier.java
index a5024c614..bd69abc28 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ColorPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ColorPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -64,4 +66,4 @@ public class ColorPhraseModifier extends PatternBasedElement {
protected PatternBasedElementProcessor newProcessor() {
return new SimplePhraseModifierProcessor(SpanType.SPAN);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ConfluenceWrappedPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ConfluenceWrappedPhraseModifier.java
index 8f7bd4f13..1f5bceacf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ConfluenceWrappedPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ConfluenceWrappedPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/EmphasisPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/EmphasisPhraseModifier.java
index ed68ec5c3..d9a81f49c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/EmphasisPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/EmphasisPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -64,4 +66,4 @@ public class EmphasisPhraseModifier extends PatternBasedElement {
protected PatternBasedElementProcessor newProcessor() {
return new EmphasisProcessor();
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/HyperlinkPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/HyperlinkPhraseModifier.java
index 02a6e0473..390612167 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/HyperlinkPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/HyperlinkPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ImagePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ImagePhraseModifier.java
index c6a87366f..119c99235 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ImagePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/ImagePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimplePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimplePhraseModifier.java
index 4c31fb175..5c31850f1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimplePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimplePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimpleWrappedPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimpleWrappedPhraseModifier.java
index 31847feb7..1fdd823d2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimpleWrappedPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/phrase/SimpleWrappedPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/AnchorReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/AnchorReplacementToken.java
index e516a8011..8ba7309a8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/AnchorReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/AnchorReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/EscapedCharacterReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/EscapedCharacterReplacementToken.java
index 04c3230f7..0d362d0f2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/EscapedCharacterReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/EscapedCharacterReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/HorizontalRuleToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/HorizontalRuleToken.java
index bd6d7efba..b3a106900 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/HorizontalRuleToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/HorizontalRuleToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/ImpliedHyperlinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/ImpliedHyperlinkReplacementToken.java
index e25098339..ae2c40a0c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/ImpliedHyperlinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/ImpliedHyperlinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/NumericEntityReferenceReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/NumericEntityReferenceReplacementToken.java
index d607c40ee..d7d276742 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/NumericEntityReferenceReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/token/NumericEntityReferenceReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Colors.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Colors.java
index 08797f9e6..572c08b70 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Colors.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Colors.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Holger Staudacher and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Holger Staudacher - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Options.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Options.java
index 7f06de7c3..31e68d046 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Options.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/util/Options.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/validation/ConfluenceReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/validation/ConfluenceReferenceValidationRule.java
index 85a51cf48..a3a52c599 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/validation/ConfluenceReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/main/java/org/eclipse/mylyn/wikitext/confluence/internal/validation/ConfluenceReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceCodeBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceCodeBlockTest.java
index 32cce3a98..25bf4714b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceCodeBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceCodeBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageIntegrationTest.java
index c757fab64..e9f76ce2a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageTest.java
index e1ca6b0c7..a89b23437 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2017 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLineBreakTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLineBreakTest.java
index f97244700..cc10a7db3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLineBreakTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/ConfluenceLineBreakTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilderTest.java
index 67007472d..ed3a6e108 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/ConfluenceDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2016 Tasktop Technologies
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/util/ColorsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/util/ColorsTest.java
index c6b395453..236467b47 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/util/ColorsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.confluence/src/test/java/org/eclipse/mylyn/wikitext/confluence/internal/util/ColorsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Holger Staudacher and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Holger Staudacher - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.creole/about.html
index 7b792eeba..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 24, 2011</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.creole/plugin.properties
index 3ac691034..f049ae0e7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2012 Igor Malinin and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/CreoleLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/CreoleLanguage.java
index bdb2e3a2f..0349ac951 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/CreoleLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/CreoleLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HeadingBlock.java
index b800dd728..21a02af26 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HorizontalRuleBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HorizontalRuleBlock.java
index e58b74a8e..d1a8af1da 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HorizontalRuleBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/HorizontalRuleBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ListBlock.java
index fccb17ef9..8c81f48fb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/NowikiBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/NowikiBlock.java
index 27cb9f0d2..ced0312d2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/NowikiBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/NowikiBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ParagraphBlock.java
index 263c6bcd8..ba06865f0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/TableBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/TableBlock.java
index d4fbbc569..4cb5515e7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/TableBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/block/TableBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/EscapePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/EscapePhraseModifier.java
index db8965475..a8898db97 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/EscapePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/EscapePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/NowikiPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/NowikiPhraseModifier.java
index 853ac4d7b..2fa52f5a1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/NowikiPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/NowikiPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/SimplePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/SimplePhraseModifier.java
index d3225c98d..2550b823b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/SimplePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/phrase/SimplePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/token/LinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/token/LinkReplacementToken.java
index 72b41a2e0..58fe0fb22 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/token/LinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/token/LinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/validation/CreoleReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/validation/CreoleReferenceValidationRule.java
index 8532edeb3..57c59771d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/validation/CreoleReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/main/java/org/eclipse/mylyn/wikitext/creole/internal/validation/CreoleReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/test/java/org/eclipse/mylyn/internal/wikitext/creole/tests/CreoleLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/test/java/org/eclipse/mylyn/internal/wikitext/creole/tests/CreoleLanguageTest.java
index af1653c18..4ad9bba06 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/test/java/org/eclipse/mylyn/internal/wikitext/creole/tests/CreoleLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.creole/src/test/java/org/eclipse/mylyn/internal/wikitext/creole/tests/CreoleLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2013 Igor Malinin and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Igor Malinin - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.html/about.html
index bc6e2b493..d47703fc7 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguage.java
index af58fa196..e59299107 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilder.java
index 3d6c917c4..9e1068948 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockSeparator.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockSeparator.java
index 65eeeda29..069f82d3b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockSeparator.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockSeparator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategies.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategies.java
index 3e11d6fa6..55a0377ec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategies.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategies.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategy.java
index 54e9cee6c..e0db46e65 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategy.java
index adce31852..80eed6895 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementMatcher.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementMatcher.java
index e243c4e4a..fee6d535f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementMatcher.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementMatcher.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementStrategies.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementStrategies.java
index 28cdc12ef..241b5435c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementStrategies.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/ElementStrategies.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategy.java
index 183cf59b0..c6c9243f4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlElementStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlElementStrategy.java
index 82eee7f84..6fed7b9e0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlElementStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlElementStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilder.java
index 48926508b..959d644e7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguage.java
index 00400cc16..b5dd40de5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/LiteralHtmlDocumentHandler.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/LiteralHtmlDocumentHandler.java
index 08e2661ec..8ab0b0b24 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/LiteralHtmlDocumentHandler.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/LiteralHtmlDocumentHandler.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/NoOpBlockStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/NoOpBlockStrategy.java
index 5f3889a0c..41f9cb4e6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/NoOpBlockStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/NoOpBlockStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanHtmlElementStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanHtmlElementStrategy.java
index 27a01b456..b8fcba6fb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanHtmlElementStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanHtmlElementStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java
index 63d3571bf..d044a1674 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategies.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategy.java
index 2f7e30a19..a5f805ef9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategy.java
index 2bcd2238c..aab5a4cc6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategy.java
index a48d3cf15..95774d8b1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategy.java
index 9808c0573..6bb8659f5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedBlockStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedBlockStrategy.java
index c33c9501f..00594bf8d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedBlockStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedBlockStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedSpanStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedSpanStrategy.java
index 57c4ce819..7392d0c59 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedSpanStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/SupportedSpanStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedBlockStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedBlockStrategy.java
index f357b8087..84777b3ee 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedBlockStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedBlockStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedSpanStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedSpanStrategy.java
index 950867078..6d88b5ee7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedSpanStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/main/java/org/eclipse/mylyn/wikitext/html/internal/UnsupportedSpanStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilderTest.java
index dc3aea081..9a729832b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageTest.java
index 2dceb374f..d1c2b52fb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/HtmlLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java
index 565be6f53..dfb7622d0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java
index 6f77a7aaa..9c7e874cd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java
index 9ff14811a..7c206c1df 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlLanguageIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlLanguageIntegrationTest.java
index 3e47ff1f4..e03799b87 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlLanguageIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlLanguageIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderTest.java
index fac1301a1..537610910 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderXhtmlStrictTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderXhtmlStrictTest.java
index 911ecb958..b56875319 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderXhtmlStrictTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetDocumentBuilderXhtmlStrictTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Tomasz Zarna - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguageTest.java
index f22e12c40..34cf9d629 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/HtmlSubsetLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java
index f3813516c..89fc3c388 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java
index e8dfa851d..6288e04f6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java
index a623b870d..13dda0eb5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java
index 59bd21e3e..e65608db9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/about.html
index 7b792eeba..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 24, 2011</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/plugin.properties
index 52d91c88d..31cf52ab7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2013 Stefan Seelmann and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/MarkdownLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/MarkdownLanguage.java
index a15c81a72..b33d9551d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/MarkdownLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/MarkdownLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2015 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategy.java
index 41c880b29..8c234178a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinition.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinition.java
index ee61db476..8d7724655 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinition.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinition.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionParser.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionParser.java
index 4497dde51..82c3c5eec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionUsageTracker.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionUsageTracker.java
index 90aca7c39..dd5099cfc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionUsageTracker.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/LinkDefinitionUsageTracker.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownContentState.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownContentState.java
index 19e031966..e0527d2e2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownContentState.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownContentState.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownDocumentBuilder.java
index 8c7c51cb7..7984cb65a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/MarkdownDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014, 2015 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Leo Dos Santos - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/CodeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/CodeBlock.java
index 633367242..7d6d59822 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/CodeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/CodeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HeadingBlock.java
index b72181437..a9b5135fa 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HorizontalRuleBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HorizontalRuleBlock.java
index 6d93b1ea4..01edc31e8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HorizontalRuleBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/HorizontalRuleBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2015 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/InlineHtmlBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/InlineHtmlBlock.java
index 5bc4e34b5..1f81c69e0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/InlineHtmlBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/InlineHtmlBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/LinkDefinitionBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/LinkDefinitionBlock.java
index 6e9fcd575..78a51181d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/LinkDefinitionBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/LinkDefinitionBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ListBlock.java
index 5b1e88191..e54ebd6a0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/NestableBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/NestableBlock.java
index 98d2cdf33..7eff0a84b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/NestableBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/NestableBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ParagraphBlock.java
index a3ffc0b29..ef7fd2323 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2015 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/QuoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/QuoteBlock.java
index f4bee1a55..342e89a50 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/QuoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/QuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2015 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/UnderlinedHeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/UnderlinedHeadingBlock.java
index b3d2afa23..ba63abfdf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/UnderlinedHeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/block/UnderlinedHeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/BackslashEscapePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/BackslashEscapePhraseModifier.java
index 2668c9404..2146dcf14 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/BackslashEscapePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/BackslashEscapePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/SimplePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/SimplePhraseModifier.java
index ff6eeaf28..aaef24c90 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/SimplePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/phrase/SimplePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2015 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/AutomaticLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/AutomaticLinkReplacementToken.java
index 007f8f545..3a5ae878b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/AutomaticLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/AutomaticLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineImageReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineImageReplacementToken.java
index 3aeceee99..cc4d169ec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineImageReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineImageReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineLinkReplacementToken.java
index b1074ab27..3108b2333 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/InlineLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/PreserverHtmlEntityToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/PreserverHtmlEntityToken.java
index 9c6036d6a..d02f4ed5d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/PreserverHtmlEntityToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/PreserverHtmlEntityToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2014 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleImageReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleImageReplacementToken.java
index 17481388a..6b47a62ae 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleImageReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleImageReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleLinkReplacementToken.java
index 4186ede87..ec7df069f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/token/ReferenceStyleLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/LookAheadReader.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/LookAheadReader.java
index 79c8a1eeb..35c2c452f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/LookAheadReader.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/LookAheadReader.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadBlock.java
index ebb1c4465..459753107 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadDispatcher.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadDispatcher.java
index 5dc609816..5ba723f0a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadDispatcher.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/util/ReadAheadDispatcher.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/LinkDefinitionValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/LinkDefinitionValidationRule.java
index 4b1acf7e8..21acb2314 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/LinkDefinitionValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/LinkDefinitionValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/MarkdownReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/MarkdownReferenceValidationRule.java
index df92baa8b..7314ae2b7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/MarkdownReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/MarkdownReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/Messages.java
index 4f7411062..dac689a98 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/messages.properties
index fe1fb9f9d..62214a630 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/main/java/org/eclipse/mylyn/wikitext/markdown/internal/validation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013 Stefan Seelmann
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionParserTest.java
index ba58b4b27..d6a128a0c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionValidationRuleTest.java
index f0f653ee6..789515a72 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/LinkDefinitionValidationRuleTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownDocumentBuilderTest.java
index 6b12896b6..fb95edb01 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Tasktop Technologies
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Leo Dos Santos - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownHeadingTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownHeadingTest.java
index 56fade9ee..173f04410 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownHeadingTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownHeadingTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageBlockElementsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageBlockElementsTest.java
index 631801d3b..4f74a5e38 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageBlockElementsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageBlockElementsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2015 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageMiscellaneousTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageMiscellaneousTest.java
index 1fa7b7362..33e3bb789 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageMiscellaneousTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageMiscellaneousTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageParagraphBreakingBlocksDisabledTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageParagraphBreakingBlocksDisabledTest.java
index 7c2f316d1..8e129f77a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageParagraphBreakingBlocksDisabledTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageParagraphBreakingBlocksDisabledTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Stephan Wahlbrink and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephan Wahlbrink - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageSpanElementsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageSpanElementsTest.java
index 4e579e46b..f5cb3aca8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageSpanElementsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageSpanElementsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2014 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTest.java
index ba11e704f..f79f3c4a4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2014 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTestBase.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTestBase.java
index 17dfb68ee..b48c95192 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTestBase.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownLanguageTestBase.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2014 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownReferenceValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownReferenceValidationRuleTest.java
index 81d6f828f..15359dc80 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownReferenceValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownReferenceValidationRuleTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 Stefan Seelmann and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stefan Seelmann - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownRoundTripTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownRoundTripTest.java
index 656f152be..1266fd35d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownRoundTripTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownRoundTripTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java
index 25300d3de..c7d6bcaef 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.maven/about.html
index da126e466..193bdda08 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/BuildFailureException.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/BuildFailureException.java
index 9d65244dc..27cc3cc34 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/BuildFailureException.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/BuildFailureException.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguage.java
index 429c8fb9f..1e65318a4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojo.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojo.java
index 8a6d24a02..4e262090e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojo.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojo.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversal.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversal.java
index 2b9be29db..c8346dac2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversal.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/main/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversal.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java
index 670607de4..58847dc19 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojoTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojoTest.java
index a9f229a3c..ba712d209 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojoTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/MarkupToEclipseHelpMojoTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java
index 0fb318db6..dbe79cdf5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ConfigurationException.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ConfigurationException.java
index e23e9dc91..266cd7bee 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ConfigurationException.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ConfigurationException.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/HtmlSourceImageFetchingStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/HtmlSourceImageFetchingStrategy.java
index e82c5388d..d87ea8659 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/HtmlSourceImageFetchingStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/HtmlSourceImageFetchingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ImageFetchingStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ImageFetchingStrategy.java
index 21e289cbb..1bec8f725 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ImageFetchingStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/ImageFetchingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiApiImageFetchingStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiApiImageFetchingStrategy.java
index 113343a4a..31f145386 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiApiImageFetchingStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiApiImageFetchingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcher.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcher.java
index b74253baf..12b1bef4a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcher.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcher.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2004, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/Messages.java
index 2edb0c3ab..19d849660 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTask.java
index 395e2e202..d8921a479 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/messages.properties
index 003c28d3a..d1b2f3486 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010, 2016 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
@@ -32,4 +34,4 @@ WikiToDocTask_stylesheet_not_both=Cannot specify both stylesheet/@file and style
WikiToDocTask_writing_toc=Writing table of contents to {0}
WikiToDocTask_path_name_must_be_unique=path name must be unique: ''{0}'' is already specified.
WikiToDocTask_tocParentName_not_in_unified_toc=Cannot specify tocParentName when includeInUnifiedToc is false (path {0})
-WikiToDocTask_unknown_tocParentName=Unknown tocParentName ''{0}'' \ No newline at end of file
+WikiToDocTask_unknown_tocParentName=Unknown tocParentName ''{0}''
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/tasks.properties b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/tasks.properties
index 362022087..e83d95ee0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/tasks.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/ant/tasks.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009, 2015 Chris Aniszczyk and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Chris Aniszczyk - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcherTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcherTest.java
index c997b1aac..d03ffffde 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcherTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiImageFetcherTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiMockFixture.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiMockFixture.java
index e09beee6c..95ed9a2ff 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiMockFixture.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/MediaWikiMockFixture.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiApiImageFetchingStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiApiImageFetchingStrategy.java
index 4d92d6374..79f039627 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiApiImageFetchingStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiApiImageFetchingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiImageFetcher.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiImageFetcher.java
index 039ebb267..4cfff4e1b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiImageFetcher.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestMediaWikiImageFetcher.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestWikiToDocTask.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestWikiToDocTask.java
index 300bae691..b352712e2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestWikiToDocTask.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/TestWikiToDocTask.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskIntegrationTest.java
index 86516335f..9d16e1014 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskTest.java
index b33ae543d..886ff567b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki.ant/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/ant/internal/tasks/WikiToDocTaskTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/plugin.properties
index 3cbf0d204..ec9642b76 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/plugin.properties
@@ -1,13 +1,15 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
###############################################################################
#Properties file for org.eclipse.mylyn.wikitext.mediawiki
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText MediaWiki \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText MediaWiki
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/MediaWikiLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/MediaWikiLanguage.java
index 2234c8476..47f7b6cba 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/MediaWikiLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/MediaWikiLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/PageMapping.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/PageMapping.java
index 21ec8f99c..035dc570e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/PageMapping.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/PageMapping.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/Template.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/Template.java
index 705b3bd41..ee8d4acd1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/Template.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/Template.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/TemplateResolver.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/TemplateResolver.java
index 623fb8b01..58c0aac2b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/TemplateResolver.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/TemplateResolver.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolver.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolver.java
index 72297c9f6..d930087fc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolver.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolver.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/AbstractMediaWikiLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/AbstractMediaWikiLanguage.java
index 0e52b87b8..c5df8017e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/AbstractMediaWikiLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/AbstractMediaWikiLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/BuiltInTemplateResolver.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/BuiltInTemplateResolver.java
index 865460264..69cf8afe9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/BuiltInTemplateResolver.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/BuiltInTemplateResolver.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/DateTimeTemplate.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/DateTimeTemplate.java
index 09a55cb1a..463b9ac49 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/DateTimeTemplate.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/DateTimeTemplate.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategy.java
index f66d148c3..c5b06e429 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/Messages.java
index 402c2619a..8f5b77383 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessor.java
index 7914610e4..10f778f68 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/AbstractTableOfContentsBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/AbstractTableOfContentsBlock.java
index 2b1b5733e..20e9ee6e5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/AbstractTableOfContentsBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/AbstractTableOfContentsBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -66,4 +68,4 @@ public abstract class AbstractTableOfContentsBlock extends Block {
this.maxLevel = maxLevel;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/BehaviorSwitchBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/BehaviorSwitchBlock.java
index ff4414530..af6253ede 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/BehaviorSwitchBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/BehaviorSwitchBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/CommentBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/CommentBlock.java
index c254856d2..ba8abe9ba 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/CommentBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/CommentBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/EscapeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/EscapeBlock.java
index d123982c7..2c435836e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/EscapeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/EscapeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/HeadingBlock.java
index 60a0307be..cf34b586b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ListBlock.java
index 950a4f405..e3a578181 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ParagraphBlock.java
index c65ff0740..69240b0b3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/PreformattedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/PreformattedBlock.java
index 904740011..4a330e098 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/PreformattedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/PreformattedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/SourceBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/SourceBlock.java
index 94917eb41..943176223 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/SourceBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/SourceBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableBlock.java
index b609caa46..59b592273 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableOfContentsBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableOfContentsBlock.java
index 2edd8ccde..44e41908f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableOfContentsBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/block/TableOfContentsBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/messages.properties
index 0e78ae321..b2edc6985 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/messages.properties
@@ -1,12 +1,14 @@
###############################################################################
# Copyright (c) 2012 Jeremie Bresson and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Jeremie Bresson - initial API and implementation
###############################################################################
TemplateProcessor_loopDetected=Template loop detected:{0}
-AbstractMediaWikiLanguage_cannotComputeUrl=Cannot compute url: {0} \ No newline at end of file
+AbstractMediaWikiLanguage_cannotComputeUrl=Cannot compute url: {0}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/EscapePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/EscapePhraseModifier.java
index 2921adcdf..26f9ef16f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/EscapePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/EscapePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimplePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimplePhraseModifier.java
index 5c45e844c..56501c66b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimplePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimplePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimpleWrappedPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimpleWrappedPhraseModifier.java
index f7a73a8c6..5dfe83e52 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimpleWrappedPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/phrase/SimpleWrappedPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/EntityReferenceReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/EntityReferenceReplacementToken.java
index c087a78e5..88ebd8305 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/EntityReferenceReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/EntityReferenceReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkExternalReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkExternalReplacementToken.java
index c1439466b..93085bd4f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkExternalReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkExternalReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkInternalReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkInternalReplacementToken.java
index 87a5f77d8..5d23faa10 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkInternalReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkInternalReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkReplacementToken.java
index 758106e71..b5bd3eb8a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/HyperlinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/ImageReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/ImageReplacementToken.java
index f0cd1af50..018a5c0aa 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/ImageReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/ImageReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/LineBreakToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/LineBreakToken.java
index 29a8bf251..c69ba7365 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/LineBreakToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/token/LineBreakToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRule.java
index 82fba90b5..84be5ca65 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/MediaWikiReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/MediaWikiReferenceValidationRule.java
index 7851ecc0c..1581a165f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/MediaWikiReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/MediaWikiReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/Messages.java
index 4b4e13541..ce90a423c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/messages.properties
index 2a67853a0..cabba35bf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/main/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2008 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/TestWikiTemplateResolver.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/TestWikiTemplateResolver.java
index 2b0e6f6ba..a9c236530 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/TestWikiTemplateResolver.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/TestWikiTemplateResolver.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java
index 67553aab6..d92cfd0dd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java
index 363c3ce6b..ad73310c7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiLanguageTest.java
index 5b8b50f38..de4053718 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java
index 7f2fec878..30adbc0eb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java
index af8773302..bf8c6c1b9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/builder/DitaTopicDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/builder/DitaTopicDocumentBuilderTest.java
index a28378236..4bd1978a5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/builder/DitaTopicDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/builder/DitaTopicDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/AbstractSaxParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/AbstractSaxParserTest.java
index 57cc849cd..7e435ce71 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/AbstractSaxParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/AbstractSaxParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2014 Tasktop Technologies
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/HtmlParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/HtmlParserTest.java
index 4c0514919..850bb0a9d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/HtmlParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/HtmlParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2014 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/XHtmlParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/XHtmlParserTest.java
index 33f26f5db..db6859f03 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/XHtmlParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/internal/wikitext/parser/html/XHtmlParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tasktop Technologies
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderIntegrationTest.java
index 473392f16..35ea05f10 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java
index b3d2a0536..749bc3aec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java
index 951a7bfbd..007ab8648 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/RecordingDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/RecordingDocumentBuilder.java
index 03e9d9710..43af31ab8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/RecordingDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/RecordingDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java
index 55b1e2b88..05943c218 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderIntegrationTest.java
index fdae3f0af..285d2ad2e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.textile/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.textile/plugin.properties
index b1e0b4bb7..b7a204e58 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/plugin.properties
@@ -1,13 +1,15 @@
###############################################################################
# Copyright (c) 2007, 2009 Mylyn project committers and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
###############################################################################
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText Textile \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText Textile
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/TextileLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/TextileLanguage.java
index a12d72a1e..71a5daffc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/TextileLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/TextileLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/Textile.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/Textile.java
index 059869ed2..eacae96ab 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/Textile.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/Textile.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileContentState.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileContentState.java
index 94020222b..05765d226 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileContentState.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileContentState.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilder.java
index 949d98f08..d55b7ab3d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/AbstractTableOfContentsBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/AbstractTableOfContentsBlock.java
index 70a8635f0..65035b264 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/AbstractTableOfContentsBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/AbstractTableOfContentsBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -84,4 +86,4 @@ public abstract class AbstractTableOfContentsBlock extends Block {
this.maxLevel = maxLevel;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CodeBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CodeBlock.java
index 665eb0ddc..91a69a2f3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CodeBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CodeBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlock.java
index 59ef4596e..43ae63c6b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/DefinitionListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/DefinitionListBlock.java
index bb07ee8dd..3d4bff289 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/DefinitionListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/DefinitionListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/FootnoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/FootnoteBlock.java
index 9375f93ac..d9d8baa11 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/FootnoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/FootnoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/HeadingBlock.java
index 5e557a752..ea989cbeb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ListBlock.java
index 1db90038f..16e8a2c58 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileBlock.java
index 9ca435303..cf77c420e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileTagBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileTagBlock.java
index 992399d1f..c0ebca258 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileTagBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/NotextileTagBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ParagraphBlock.java
index e67a518c8..ff2f5b64a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/PreformattedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/PreformattedBlock.java
index b69c763d6..22cd2c9e9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/PreformattedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/PreformattedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/QuoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/QuoteBlock.java
index 1baa9ead9..a8fd9d30c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/QuoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/QuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableBlock.java
index 15b57f1f7..072ee3379 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableOfContentsBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableOfContentsBlock.java
index bd67611f6..4c1883869 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableOfContentsBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TableOfContentsBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TextileGlossaryBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TextileGlossaryBlock.java
index babfbfd37..36bc2deff 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TextileGlossaryBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/block/TextileGlossaryBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifier.java
index d09aff05a..be95a63b7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/HyperlinkPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/HyperlinkPhraseModifier.java
index 531f8aea5..454bf6f66 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/HyperlinkPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/HyperlinkPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/ImageTextilePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/ImageTextilePhraseModifier.java
index efd7abb8f..0543e6c7f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/ImageTextilePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/ImageTextilePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/SimpleTextilePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/SimpleTextilePhraseModifier.java
index 30e652f4c..6798dc2dc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/SimpleTextilePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/SimpleTextilePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifier.java
index f5e248947..7e7187bcb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/EntityReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/EntityReplacementToken.java
index 52d0f6ff2..eb0e37a4a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/EntityReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/EntityReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/FootnoteReferenceReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/FootnoteReferenceReplacementToken.java
index 2990ba7db..fea681187 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/FootnoteReferenceReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/token/FootnoteReferenceReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRule.java
index 374703318..878ee567b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/Messages.java
index 42bad65f7..64a294ee8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRule.java
index 7ab751989..ce4cf69f1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/messages.properties
index f5f8be39f..927bbd33b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/internal/validation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2008 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language.properties b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language.properties
index 11223dbce..a209a8085 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_de.properties b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_de.properties
index fdc20b4ba..d11a23277 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_de.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_de.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_fr.properties b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_fr.properties
index 0a6951ab9..a5b940e01 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_fr.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/main/java/org/eclipse/mylyn/wikitext/textile/language_fr.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileCommentBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileCommentBlockTest.java
index de4936db3..50f494b75 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileCommentBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileCommentBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageDefinitionListTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageDefinitionListTest.java
index c65bd0709..339873421 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageDefinitionListTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageDefinitionListTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageTest.java
index 0f5037b85..08b924817 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileNoTextileTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileNoTextileTest.java
index 202192f6d..0727d5e24 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileNoTextileTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/TextileNoTextileTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java
index 82f7a1418..917c6c9fe 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderEntityReferenceTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderEntityReferenceTest.java
index 2d4c607ea..45958ad83 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderEntityReferenceTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderEntityReferenceTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderTest.java
index eac809819..c27062236 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2014 Tasktop Technologies
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java
index 28057c5a2..eabb40beb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java
index 75cb88165..6980c73b0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java
index b8599e2a4..9280402cb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java
index c25abe7c1..2c6c01a47 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java
index f460fbcf3..5fe7a5567 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java
index f69fbc16e..428f8e8f2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/AbstractMarkupGenerationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/AbstractMarkupGenerationTest.java
index 6389b51bb..82c601b77 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/AbstractMarkupGenerationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/AbstractMarkupGenerationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/RecordingDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/RecordingDocumentBuilder.java
index fa46b7d02..156c7a1ad 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/RecordingDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/RecordingDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/StackDumpOnTimeoutRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/StackDumpOnTimeoutRule.java
index 30eaa87c4..866f6d189 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/StackDumpOnTimeoutRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/StackDumpOnTimeoutRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Tasktop Technologies Inc. and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -65,4 +67,4 @@ public class StackDumpOnTimeoutRule extends TimeoutActionRule {
}
}
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/TestResources.java b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/TestResources.java
index a54fadc88..d3e1da651 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/TestResources.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.toolkit/src/main/java/org/eclipse/mylyn/wikitext/toolkit/TestResources.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2017 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/plugin.properties
index 876260b2a..a4a23d61d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguage.java
index 31990ad90..3a7dee06f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -44,9 +46,8 @@ import org.eclipse.mylyn.wikitext.tracwiki.internal.token.WikiWordReplacementTok
/**
* An implementation of the <a href="http://trac.edgewall.org/wiki/TracWiki">TracWiki</a> markup language.
- *
+ *
* @author David Green
- *
*/
public class TracWikiLanguage extends AbstractMarkupLanguage {
@@ -60,7 +61,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* Convert a page name to an href to the page.
- *
+ *
* @param pageName
* the name of the page to target
* @return the href to access the page
@@ -77,7 +78,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* convert a ticket id to a hyperlink based on the {@link #getServerUrl() server url}
- *
+ *
* @param ticketId
* the id of the ticket
* @param commentNumber
@@ -93,7 +94,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* convert a changeset id to a hyperlink based on the {@link #getServerUrl() server url}
- *
+ *
* @param changesetId
* the changeset id
* @param restriction
@@ -109,7 +110,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* convert a revisions to a revision log hyperlink based on the {@link #getServerUrl() server url}
- *
+ *
* @param revision1
* the first revision
* @param revision2
@@ -128,7 +129,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* convert a report id to a hyperlink based on the {@link #getServerUrl() server url}
- *
+ *
* @param reportId
* the id of the report
*/
@@ -139,7 +140,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* convert a milestone id to a hyperlink based on the {@link #getServerUrl() server url}
- *
+ *
* @param milestoneId
* the id of the milesonte
*/
@@ -150,7 +151,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* create an URL to an attachment ticket based on the {@link #getServerUrl() server url}
- *
+ *
* @param ticketId
* the id of the ticket
* @param attachment
@@ -163,7 +164,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* create an URL to the source browser
- *
+ *
* @param source
* the source to be viewed
* @param revision
@@ -188,7 +189,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* for the purpose of converting wiki words into links, determine if the wiki word exists.
- *
+ *
* @see WikiWordReplacementToken
*/
public boolean computeInternalLinkExists(String link) {
@@ -212,7 +213,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* set the server URL, for example <code>http://trac.edgewall.org/</code> from which links may be derrived, such as
* <code>http://trac.edgewall.org/wiki/WikiPage</code> or <code>http://trac.edgewall.org/tickets/1</code>
- *
+ *
* @param url
* the url, or null if it is unknown.
*/
@@ -226,7 +227,7 @@ public class TracWikiLanguage extends AbstractMarkupLanguage {
/**
* the server URL, for example <code>http://trac.edgewall.org/</code> from which links may be derrived, such as
* <code>http://trac.edgewall.org/wiki/WikiPage</code> or <code>http://trac.edgewall.org/tickets/1</code>
- *
+ *
* @see #setServerUrl(String)
*/
public String getServerUrl() {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/DefinitionListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/DefinitionListBlock.java
index e2ae3a804..fbbfaecbe 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/DefinitionListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/DefinitionListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Jeremie Bresson and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Jeremie Bresson - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/HeadingBlock.java
index b51d22c62..b71d54970 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ListBlock.java
index 66537f5fe..63b67f6b9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ParagraphBlock.java
index 004484949..58d851306 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/PreformattedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/PreformattedBlock.java
index bf08d3760..f43b1a684 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/PreformattedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/PreformattedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/QuoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/QuoteBlock.java
index 8072bc995..1d72b44fd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/QuoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/QuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/TableBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/TableBlock.java
index 9543b035a..d5719f6d2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/TableBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/block/TableBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/EscapePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/EscapePhraseModifier.java
index 70c6f5e4e..c32d18653 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/EscapePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/EscapePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/MonospacePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/MonospacePhraseModifier.java
index 453dfe579..3519a7093 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/MonospacePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/MonospacePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimplePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimplePhraseModifier.java
index 4f30f5b13..4f0dcdc3a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimplePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimplePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimpleWrappedPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimpleWrappedPhraseModifier.java
index f42f90759..8a10e721d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimpleWrappedPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/phrase/SimpleWrappedPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/BangEscapeToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/BangEscapeToken.java
index 11a364a7c..8aeecba9f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/BangEscapeToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/BangEscapeToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ChangesetLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ChangesetLinkReplacementToken.java
index 9b6533031..936caffef 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ChangesetLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ChangesetLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/HyperlinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/HyperlinkReplacementToken.java
index f1c4f3f0b..6bddc0d84 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/HyperlinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/HyperlinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/LineBreakToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/LineBreakToken.java
index 170c2cb55..c8acbda69 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/LineBreakToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/LineBreakToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MacroReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MacroReplacementToken.java
index 0c8f387dc..1c521f923 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MacroReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MacroReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 Mat Booth and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mat Booth
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MilestoneLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MilestoneLinkReplacementToken.java
index 610f6efcb..f6769c68a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MilestoneLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/MilestoneLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ReportLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ReportLinkReplacementToken.java
index b444da3a8..506c7810c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ReportLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/ReportLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/RevisionLogReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/RevisionLogReplacementToken.java
index 09e484b53..6c84c77d8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/RevisionLogReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/RevisionLogReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/SourceLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/SourceLinkReplacementToken.java
index 238909109..cf2d362de 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/SourceLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/SourceLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketAttachmentLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketAttachmentLinkReplacementToken.java
index 5487ab6f0..a6c438d78 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketAttachmentLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketAttachmentLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketLinkReplacementToken.java
index 16b812f76..bb073c711 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/TicketLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiLinkReplacementToken.java
index 5516ffd64..b009ac0bf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiWordReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiWordReplacementToken.java
index cfa2814b6..5574f7324 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiWordReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/token/WikiWordReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/validation/TracWikiReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/validation/TracWikiReferenceValidationRule.java
index 9d3aea824..23c1cb584 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/validation/TracWikiReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/main/java/org/eclipse/mylyn/wikitext/tracwiki/internal/validation/TracWikiReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java
index 3b5177909..88e6c8565 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/WikiWordReplacementTokenTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/WikiWordReplacementTokenTest.java
index 7b3536e2c..15c40ffaf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/WikiWordReplacementTokenTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/WikiWordReplacementTokenTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Holger Voormann - initial API and implementation (tests for bug 279029)
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/about.html b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/plugin.properties
index eca6cf05f..c3fa7c20a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 Mylyn project committers and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/TWikiLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/TWikiLanguage.java
index 31ab6e6b3..687644cf3 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/TWikiLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/TWikiLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/DefinitionListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/DefinitionListBlock.java
index 89c053fdd..95157f9ef 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/DefinitionListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/DefinitionListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HeadingBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HeadingBlock.java
index 01e27c1d3..27f4fed51 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HeadingBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HeadingBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HorizontalRuleBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HorizontalRuleBlock.java
index fa64b0148..51e76ab79 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HorizontalRuleBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/HorizontalRuleBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ListBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ListBlock.java
index 0afcf2979..0565291f6 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ListBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ListBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/LiteralBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/LiteralBlock.java
index 1c5216858..25c36730d 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/LiteralBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/LiteralBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ParagraphBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ParagraphBlock.java
index ba5f31396..c791e2022 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ParagraphBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/ParagraphBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/TableOfContentsBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/TableOfContentsBlock.java
index b031a6b1d..ecb147fe2 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/TableOfContentsBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/TableOfContentsBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/VerbatimBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/VerbatimBlock.java
index 64ceb5288..f76ae13f0 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/VerbatimBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/block/VerbatimBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/AutoLinkSwitchPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/AutoLinkSwitchPhraseModifier.java
index 356a6a180..2f315c8cf 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/AutoLinkSwitchPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/AutoLinkSwitchPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimplePhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimplePhraseModifier.java
index 7ce8ee32a..057002954 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimplePhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimplePhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimpleWrappedPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimpleWrappedPhraseModifier.java
index 92131dcfe..28b8e3f57 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimpleWrappedPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/phrase/SimpleWrappedPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/IconReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/IconReplacementToken.java
index 99390f638..fb3797e78 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/IconReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/IconReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/ImpliedEmailLinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/ImpliedEmailLinkReplacementToken.java
index 690ff84ab..a5695ea00 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/ImpliedEmailLinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/ImpliedEmailLinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/LinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/LinkReplacementToken.java
index 42960ad22..35cd3d82c 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/LinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/LinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/WikiWordReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/WikiWordReplacementToken.java
index 1697e2708..1b079eef3 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/WikiWordReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/token/WikiWordReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRule.java
index 19a41c2e9..d5ff5f1c4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/Messages.java
index f73fedf26..cc4acf72a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/TWikiReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/TWikiReferenceValidationRule.java
index b693d54f0..d189d124e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/TWikiReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/TWikiReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/messages.properties
index 5d6c5aa69..4dc7ef590 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2008 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/resources/services/org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/resources/services/org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage
index f48198ec5..1448eee4d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/resources/services/org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/main/resources/services/org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage
@@ -1 +1 @@
-org.eclipse.mylyn.wikitext.twiki.TWikiLanguage \ No newline at end of file
+org.eclipse.mylyn.wikitext.twiki.TWikiLanguage
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/internal/wikitext/twiki/tests/TWikiLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/internal/wikitext/twiki/tests/TWikiLanguageTest.java
index 94ad35561..d90248a34 100755
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/internal/wikitext/twiki/tests/TWikiLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/internal/wikitext/twiki/tests/TWikiLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java
index c35fb591e..ed5f5181d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/about.html b/wikitext/core/org.eclipse.mylyn.wikitext/about.html
index da126e466..193bdda08 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/about.html
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/plugin.properties b/wikitext/core/org.eclipse.mylyn.wikitext/plugin.properties
index 0037791be..13901ce20 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/plugin.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 Mylyn project committers and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -11,4 +13,4 @@
#Properties file for org.eclipse.mylyn.wikitext
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/AbstractSaxHtmlParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/AbstractSaxHtmlParser.java
index a1ba3924e..be87d7d00 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/AbstractSaxHtmlParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/AbstractSaxHtmlParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessor.java
index 273dacb9a..759c61a33 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2013 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -56,4 +58,4 @@ public abstract class DocumentProcessor {
}
}
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/Html.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/Html.java
index 1a5730c61..5c194e891 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/Html.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/Html.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleaner.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleaner.java
index c3cf179eb..2a8e19aee 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleaner.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleaner.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParser.java
index b0ae931e3..6ef8f7841 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2013 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveEmptySpansProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveEmptySpansProcessor.java
index 47613fe75..42149e0a6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveEmptySpansProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveEmptySpansProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveExcessiveStylesProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveExcessiveStylesProcessor.java
index 19916d161..c52e170da 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveExcessiveStylesProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RemoveExcessiveStylesProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2013 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RepairBrokenCSSColorStylesProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RepairBrokenCSSColorStylesProcessor.java
index 87ae91d7d..e19c5a2de 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RepairBrokenCSSColorStylesProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/RepairBrokenCSSColorStylesProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/WhitespaceCleanupProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/WhitespaceCleanupProcessor.java
index f433c94bb..45902cb13 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/WhitespaceCleanupProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/WhitespaceCleanupProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParser.java
index 7c7833b20..b1a3fd78b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/util/ConcatenatingReader.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/util/ConcatenatingReader.java
index 9b57953ff..5fc24bcd4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/util/ConcatenatingReader.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/internal/util/ConcatenatingReader.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tasktop Technologies
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Attributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Attributes.java
index d70961fd5..296c85805 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Attributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Attributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -122,4 +124,4 @@ public class Attributes implements Cloneable {
throw Throwables.propagate(e);
}
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/DocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/DocumentBuilder.java
index aeadebfcf..35cb3ef83 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/DocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/DocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HeadingAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HeadingAttributes.java
index 538a369aa..efda7ddff 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HeadingAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HeadingAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HtmlParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HtmlParser.java
index 812aa8838..4d4cb8fce 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HtmlParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/HtmlParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/IdGenerator.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/IdGenerator.java
index 08b684624..0fdcadd71 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/IdGenerator.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/IdGenerator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ImageAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ImageAttributes.java
index 22e85d1ae..144668cbb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ImageAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ImageAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/LinkAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/LinkAttributes.java
index ecf29eefb..40aadf51e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/LinkAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/LinkAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ListAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ListAttributes.java
index 9828c0331..6178d4d8d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ListAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/ListAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Locator.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Locator.java
index 3899a255d..cccfe9b7c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Locator.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/Locator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/MarkupParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/MarkupParser.java
index ff772a826..402c2dd2b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/MarkupParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/MarkupParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/QuoteAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/QuoteAttributes.java
index b79f4c2df..f249f5621 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/QuoteAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/QuoteAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableAttributes.java
index c65b7547a..f30167eae 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableCellAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableCellAttributes.java
index 9f2674bba..084c8ecd1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableCellAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableCellAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableRowAttributes.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableRowAttributes.java
index 9b533cce2..bc96856e2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableRowAttributes.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/TableRowAttributes.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractMarkupDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractMarkupDocumentBuilder.java
index 22cf077ee..351432078 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractMarkupDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractMarkupDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 Tasktop Technologies
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractXmlDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractXmlDocumentBuilder.java
index 1f0f35dc7..6ef4f80e4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractXmlDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/AbstractXmlDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaBookMapDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaBookMapDocumentBuilder.java
index c695e6e91..de6762376 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaBookMapDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaBookMapDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -401,4 +403,4 @@ public class DitaBookMapDocumentBuilder extends AbstractXmlDocumentBuilder imple
this.formattingDependencies = formattingDependencies;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaTopicDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaTopicDocumentBuilder.java
index 4d919be69..bd59f3d3c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaTopicDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DitaTopicDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilder.java
index 70eff1fd3..1b96e65cc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferences.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferences.java
index 1fd8441a6..e4d25a63c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferences.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferences.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilder.java
index 2e4f314ac..abffebc94 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventLoggingDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventLoggingDocumentBuilder.java
index 6ab1bbe72..c388c67be 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventLoggingDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/EventLoggingDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder.java
index f31a943ee..06f546615 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentHandler.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentHandler.java
index 007f3aba9..5223b56c6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentHandler.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentHandler.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntities.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntities.java
index 6fcb585c0..9efdd76ab 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntities.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntities.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/Messages.java
index 0d4068ceb..c5bbc845a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilder.java
index 293b03785..466e69ef7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/NoOpDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/NoOpDocumentBuilder.java
index 2c86175eb..43153ebcc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/NoOpDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/NoOpDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilder.java
index 3c8d70948..e57605b0c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEvent.java
index 6cf20bd4a..50baf9211 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEvent.java
index 02c659412..476bc46cc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEvent.java
index ef80472ba..8ec64fa50 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEvent.java
index 65d01bb2c..2fd3e8f93 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEvent.java
index f87a32484..491d3e826 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEvent.java
index abc470c6b..fee0091ab 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEvent.java
index fe46866de..790f3a43c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvent.java
index 40b3405ec..1d7ecb79e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvents.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvents.java
index ed2eb514c..429ce67ca 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvents.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEvents.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEvent.java
index 29aec8c6c..c0f949537 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEvent.java
index 91fbf4427..da135fe10 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEvent.java
index 0a5ebb2ce..01e8acda5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEvent.java
index a3ef60a19..05d0fd3e2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEvent.java
index 75eddec49..8ff670266 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEvent.java
index 6a069583a..1d6e40f38 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEvent.java
index bfbac1863..e974eba5d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEvent.java
index 38821c8eb..3ab9cbae2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEvent.java
index d1bcb1c15..3a949e3fd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEvent.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEvent.java
index a238f9447..efe1cbb20 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEvent.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEvent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/html-entity-references.txt b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/html-entity-references.txt
index 7ae1788df..9e71b1982 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/html-entity-references.txt
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/html-entity-references.txt
@@ -2122,4 +2122,4 @@ Zopf #8484
Zscr #55349 #56501
zscr #55349 #56527
zwj #8205
-zwnj #8204 \ No newline at end of file
+zwnj #8204
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/messages.properties
index 4683f80cd..73bab35f5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2015 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/package-info.java
index 7d5b43983..6928f50b8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/builder/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/AnySelector.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/AnySelector.java
index addcfd259..5dc4fe5e7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/AnySelector.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/AnySelector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Block.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Block.java
index 93fcd26d2..8f51768c3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Block.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Block.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CompositeSelector.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CompositeSelector.java
index 1b9b37aea..d86960000 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CompositeSelector.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CompositeSelector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssClassSelector.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssClassSelector.java
index f59aafbc5..96b9e89ec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssClassSelector.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssClassSelector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssParser.java
index 6995613de..420af74bb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssRule.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssRule.java
index 648f819bd..d54d225ec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/CssRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/DescendantSelector.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/DescendantSelector.java
index a54851691..84b5315f3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/DescendantSelector.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/DescendantSelector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/ElementInfo.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/ElementInfo.java
index f15ae3a5b..b204bc1b8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/ElementInfo.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/ElementInfo.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/IdSelector.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/IdSelector.java
index 5998bfbdc..1aebba51c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/IdSelector.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/IdSelector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/NameSelector.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/NameSelector.java
index 61ee75dca..c09a70118 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/NameSelector.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/NameSelector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Selector.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Selector.java
index d8c58e07f..cc6e09441 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Selector.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Selector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequence.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequence.java
index b82eb010e..32d74efb2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequence.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequence.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Stylesheet.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Stylesheet.java
index 2421df830..c31d1d7f7 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Stylesheet.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/css/Stylesheet.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/AbstractMarkupLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/AbstractMarkupLanguage.java
index c9d8b962a..50618cc93 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/AbstractMarkupLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/AbstractMarkupLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Block.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Block.java
index 82d2b499c..fb844018d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Block.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Block.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ConfigurationBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ConfigurationBuilder.java
index 565069883..6eaed398c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ConfigurationBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ConfigurationBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ContentState.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ContentState.java
index 398536661..aa2db6c20 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ContentState.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/ContentState.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/DefaultIdGenerationStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/DefaultIdGenerationStrategy.java
index d61fc53d3..9fdacaf5c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/DefaultIdGenerationStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/DefaultIdGenerationStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/IdGenerationStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/IdGenerationStrategy.java
index d7ce2dcd8..b5f45653c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/IdGenerationStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/IdGenerationStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguage.java
index 7afb2ded0..80d8023c8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageConfiguration.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageConfiguration.java
index 35f8896ab..3183ef65c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageConfiguration.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProvider.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProvider.java
index 3aed34855..de97d3cf3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProvider.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProvider.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElement.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElement.java
index 17ce2fff6..5e0624519 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElement.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElement.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElementProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElementProcessor.java
index fa9bfac5a..3c00081a0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElementProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/PatternBasedElementProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Processor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Processor.java
index 241db65a0..5210a69ee 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Processor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/Processor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -89,4 +91,4 @@ public class Processor implements Cloneable {
throw new IllegalStateException(e);
}
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/AbstractHtmlBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/AbstractHtmlBlock.java
index 3f9900b9e..0d0774dd0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/AbstractHtmlBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/AbstractHtmlBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaGeneratedCommentBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaGeneratedCommentBlock.java
index 54d38752f..b7959dda2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaGeneratedCommentBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaGeneratedCommentBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaQuoteBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaQuoteBlock.java
index e2b6587de..9bd3914a3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaQuoteBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/BugzillaQuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/EclipseErrorDetailsBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/EclipseErrorDetailsBlock.java
index decafb90f..c3948d093 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/EclipseErrorDetailsBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/EclipseErrorDetailsBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/GlossaryBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/GlossaryBlock.java
index 8ab2c2946..0ae9b0366 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/GlossaryBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/GlossaryBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/HtmlPreformattedBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/HtmlPreformattedBlock.java
index 96da62291..58106fcfd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/HtmlPreformattedBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/HtmlPreformattedBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/JavaStackTraceBlock.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/JavaStackTraceBlock.java
index 6efa0b440..472a195ae 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/JavaStackTraceBlock.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/JavaStackTraceBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/package-info.java
index c999b921c..4634f1481 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/block/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/package-info.java
index 32c531378..6870f4ded 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlCommentPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlCommentPhraseModifier.java
index cf450721c..27338a3cd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlCommentPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlCommentPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlEndTagPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlEndTagPhraseModifier.java
index 7bd559e64..5abf3c81c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlEndTagPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlEndTagPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlStartTagPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlStartTagPhraseModifier.java
index a464aefd0..846315ed8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlStartTagPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/HtmlStartTagPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlEndTagPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlEndTagPhraseModifier.java
index d5ed9d96a..adb71a874 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlEndTagPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlEndTagPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlStartTagPhraseModifier.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlStartTagPhraseModifier.java
index d59fb0086..90390b215 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlStartTagPhraseModifier.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LimitedHtmlStartTagPhraseModifier.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LiteralPhraseModifierProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LiteralPhraseModifierProcessor.java
index 31f250b8a..fdea25f59 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LiteralPhraseModifierProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/LiteralPhraseModifierProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/package-info.java
index a88b379c6..5efbe3a0c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/phrase/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/AcronymReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/AcronymReplacementToken.java
index 1574dba28..1af4da150 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/AcronymReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/AcronymReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReferenceReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReferenceReplacementToken.java
index f6809d932..bdae45950 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReferenceReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReferenceReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReplacementTokenProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReplacementTokenProcessor.java
index b56efe09a..019529207 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReplacementTokenProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityReplacementTokenProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityWrappingReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityWrappingReplacementToken.java
index a677d6bb3..fd3f06a0f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityWrappingReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/EntityWrappingReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/ImpliedHyperlinkReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/ImpliedHyperlinkReplacementToken.java
index 865222690..15eb44984 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/ImpliedHyperlinkReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/ImpliedHyperlinkReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LineBreakReplacementTokenProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LineBreakReplacementTokenProcessor.java
index 07d09be66..efea1c0a0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LineBreakReplacementTokenProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LineBreakReplacementTokenProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LiteralReplacementTokenProcessor.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LiteralReplacementTokenProcessor.java
index 3331504a5..16365d876 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LiteralReplacementTokenProcessor.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/LiteralReplacementTokenProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternEntityReferenceReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternEntityReferenceReplacementToken.java
index 0fb6c4e34..1344bed8a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternEntityReferenceReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternEntityReferenceReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLineBreakReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLineBreakReplacementToken.java
index bea4803dc..cfa26c6f9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLineBreakReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLineBreakReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLiteralReplacementToken.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLiteralReplacementToken.java
index be41f471e..afc4b441b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLiteralReplacementToken.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/PatternLiteralReplacementToken.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/package-info.java
index cc62855f1..e54967e86 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/markup/token/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineItem.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineItem.java
index b1e07f015..829b979d6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineItem.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineItem.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineParser.java
index 95fb07f81..8cf309910 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/OutlineParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/package-info.java
index f175a5b4b..bf9988e08 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/outline/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/package-info.java
index eee2fab41..7e6f6c850 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToDocbook.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToDocbook.java
index 3298c40fb..2d1b7f227 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToDocbook.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToDocbook.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToEclipseToc.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToEclipseToc.java
index eede891e7..110c8a339 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToEclipseToc.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MarkupToEclipseToc.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/Matcher.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/Matcher.java
index d59d29290..48cd3752e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/Matcher.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/Matcher.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MatcherAdaper.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MatcherAdaper.java
index 2a645764e..d38e89ba0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MatcherAdaper.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/MatcherAdaper.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/package-info.java
index 723bdc767..511374bcc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/parser/util/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategy.java
index 2764c35c8..ad2e6c3b1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/Messages.java
index 6643f8923..0619639ab 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/NoSplittingStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/NoSplittingStrategy.java
index 6f2f8b09e..48da03aec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/NoSplittingStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/NoSplittingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplitOutlineItem.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplitOutlineItem.java
index bcae0de4e..caa9e06de 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplitOutlineItem.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplitOutlineItem.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingHtmlDocumentBuilder.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingHtmlDocumentBuilder.java
index bdcb8d75d..e21574927 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingHtmlDocumentBuilder.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingHtmlDocumentBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingMarkupToEclipseToc.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingMarkupToEclipseToc.java
index fc34f70a5..7cd18c8c6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingMarkupToEclipseToc.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingMarkupToEclipseToc.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingOutlineParser.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingOutlineParser.java
index a8a20e3e7..8492658e5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingOutlineParser.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingOutlineParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingStrategy.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingStrategy.java
index 22273c501..a9e7a8a2d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingStrategy.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/SplittingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/messages.properties
index 562d8a17a..872bd8406 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/splitter/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2015 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriter.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriter.java
index 5dedcae7b..69ed328bc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -424,4 +426,4 @@ public class DefaultXmlStreamWriter extends XmlStreamWriter {
return false;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriter.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriter.java
index d15485341..cdab247e9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -318,4 +320,4 @@ public class FormattingXMLStreamWriter extends XmlStreamWriter {
return false;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/IgnoreDtdEntityResolver.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/IgnoreDtdEntityResolver.java
index ab2b50c18..9caa5822e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/IgnoreDtdEntityResolver.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/IgnoreDtdEntityResolver.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocationTrackingReader.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocationTrackingReader.java
index 56024d7bd..bdb445dce 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocationTrackingReader.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocationTrackingReader.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocatorImpl.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocatorImpl.java
index 5d44d17f9..ee190bee9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocatorImpl.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/LocatorImpl.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/Messages.java
index aef23737d..3672a5ded 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/ServiceLocator.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/ServiceLocator.java
index 479eb025a..94fcf56e6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/ServiceLocator.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/ServiceLocator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriter.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriter.java
index a592eb6ab..2825f2fdf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -102,4 +104,4 @@ public abstract class XmlStreamWriter {
public XMLStreamWriter toXMLStreamWriter() {
return new XmlStreamWriterAdapter(this);
}
-} \ No newline at end of file
+}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapter.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapter.java
index 616cf7f96..0c738fe02 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapter.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/messages.properties
index 5b33f1115..401552c85 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/package-info.java
index c7982be52..1cee3fe8f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/util/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/DocumentLocalReferenceValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/DocumentLocalReferenceValidationRule.java
index f896d0030..0a302e47d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/DocumentLocalReferenceValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/DocumentLocalReferenceValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/MarkupValidator.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/MarkupValidator.java
index acd6ecd5e..9b31d4c16 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/MarkupValidator.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/MarkupValidator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/Messages.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/Messages.java
index aefe207ce..8b53e4b65 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/Messages.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidator.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidator.java
index b9785b263..4ecd71e89 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidator.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationProblem.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationProblem.java
index 4bcc8060d..dcef68724 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationProblem.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationProblem.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRule.java
index dc15cfe4f..539c44dc1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRules.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRules.java
index bf3466568..3b3bee592 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRules.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/ValidationRules.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/messages.properties b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/messages.properties
index ba37350cd..793100ee5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/messages.properties
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2015 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/package-info.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/package-info.java
index 8dc60b660..c92ceab6a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/package-info.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/main/java/org/eclipse/mylyn/wikitext/validation/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguage.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguage.java
index 9cf0d5cb7..4c845a25b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguage.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguageProvider.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguageProvider.java
index 86cdf802f..52d458f2c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguageProvider.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/MockMarkupLanguageProvider.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/test/EqualityAsserts.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/test/EqualityAsserts.java
index 37cce59ee..c66c838e9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/test/EqualityAsserts.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/internal/wikitext/test/EqualityAsserts.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessorTest.java
index ea2f9af40..dd9069457 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/DocumentProcessorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2013 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleanerTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleanerTest.java
index 5fae1d45e..33e2855c3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleanerTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlCleanerTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2014 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParserTest.java
index 0ad8c8577..82316d2b3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/HtmlParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java
index 4376bdbb8..ad7fdc0a2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/util/LocationTrackingReaderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/util/LocationTrackingReaderTest.java
index 790afc925..58856dca9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/util/LocationTrackingReaderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/util/LocationTrackingReaderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/AttributesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/AttributesTest.java
index ab753dcfa..426f23aea 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/AttributesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/AttributesTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java
index 96b09522c..676ff2d8c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java
index 9c2b90533..a40dfa139 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderTest.java
index 7f95b1d57..6434d9a87 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/DocBookDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java
index 3df722297..2d41eb91a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java
index eb6373881..55aef2415 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderTest.java
index 76f578630..c6a6ffd0a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java
index d843ee024..c349e6ae1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java
index 37e73d4a5..95a050784 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014, 2015 Benjamin Muskalla and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Benjamin Muskalla - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderTest.java
index afa1ede33..ac3655615 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/XslfoDocumentBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java
index 5a146e4c9..1c4d84fec 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java
index 4b86c08d2..9672fe6fa 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java
index f1d2351bc..a6d1e8b2e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java
index 32b802141..e27e67695 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java
index 083c116a3..812dfd8dc 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java
index 87288da68..c41b99685 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java
index 214cc098b..7a2ab2183 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java
index b3fa33d90..c11908f4e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java
index 6a86def49..3ba6dcc5a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java
index 2c628369c..2b054f2f0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java
index 1e7307dd7..abe7ff0f3 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java
index 77878b766..b4b7bae54 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java
index 0a5f99fe3..d4e1dff55 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java
index 4ec24bd0c..c34719dd6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java
index bb1aa9559..01855fa44 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java
index ec61d5e02..e3a44a6c0 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java
index d29e9cbd0..a73ca3974 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java
index 0717f0f82..30c4fe319 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java
index b5a053fe1..0d2cbb67b 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java
index 6030915ce..ae4237672 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java
index c10fa79d9..af7b81a92 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java
index 5d49c6490..6a658cb4e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java
index 26a3c3b70..5818c6c11 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java
index c9678cb4d..94a70ca91 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/ServiceLocatorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/ServiceLocatorTest.java
index a0c413f63..9849b7f83 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/ServiceLocatorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/ServiceLocatorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapterTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapterTest.java
index 0b68b1764..24e9256b6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapterTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/XmlStreamWriterAdapterTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java
index 1854c89b8..0da841227 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java
index 971620ee5..705d06649 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/test-plugin.xml b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/test-plugin.xml
index 50220a6d0..605cdbf40 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/test-plugin.xml
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/test-plugin.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
@@ -20,4 +22,4 @@ A plugin.xml used for testing with org.eclipse.mylyn.internal.wikitext.core.vali
markupLanguage="TestMarkupLanguage">
</rule>
</extension>
-</plugin> \ No newline at end of file
+</plugin>
diff --git a/wikitext/core/pom.xml b/wikitext/core/pom.xml
index 0041a42cb..6722469cf 100644
--- a/wikitext/core/pom.xml
+++ b/wikitext/core/pom.xml
@@ -180,8 +180,8 @@
<licenses>
<license>
- <name>Eclipse Public License Version 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ <name>Eclipse Public License Version 2.0</name>
+ <url>https://www.eclipse.org/legal/epl-2.0/</url>
<distribution>repo</distribution>
</license>
</licenses>
diff --git a/wikitext/pom.xml b/wikitext/pom.xml
index bd6f2aff1..5b608406e 100644
--- a/wikitext/pom.xml
+++ b/wikitext/pom.xml
@@ -27,8 +27,8 @@
<licenses>
<license>
- <name>Eclipse Public License Version 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ <name>Eclipse Public License Version 2.0</name>
+ <url>https://www.eclipse.org/legal/epl-2.0/</url>
<distribution>repo</distribution>
</license>
</licenses>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext-feature/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext-feature/build.properties
index 90e3fb0f7..e21b16581 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext-feature/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2014 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.properties b/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.properties
index 3555a71b4..22c00aa1a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2016 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.xml b/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.xml
index 58b001410..295d9701f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext-feature/feature.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2014 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
@@ -16,7 +18,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.wikitext"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/build.properties
index 3b389135a..cb2198787 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2015 Max Rydahl Andersen and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Max Rydahl Andersen - copied from markdown to get base for asciidoc
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/plugin.properties
index ba37b59e5..64dadf4cb 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2015 Max Rydahl Andersen and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Max Rydahl Andersen - copied from markdown to get base for asciidoc
@@ -11,4 +13,4 @@
#Properties file for org.eclipse.mylyn.wikitext.tests
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText AsciiDoc Tests Plug-in \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText AsciiDoc Tests Plug-in
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/src/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocTemplateResolverTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/src/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocTemplateResolverTest.java
index 09d9bfe1a..04bcfce86 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/src/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocTemplateResolverTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.tests/src/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocTemplateResolverTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Max Rydahl Andersen and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Max Rydahl Andersen- initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/about.html
index d774b07c7..df05931df 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 25, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/build.properties
index 4d82a6aa9..a8c9c9664 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2015 Max Rydahl Andersen and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Max Rydahl Andersen - copied from markdown to get base for asciidoc
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/plugin.properties
index 1a1b81d80..1501aed4c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.asciidoc.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2015 Max Rydahl Andersen and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Max Rydahl Andersen - copied from markdown to get base for asciidoc
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/META-INF/l10n/bundle.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/META-INF/l10n/bundle.properties
index 707e07bd1..8e69be9b9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/META-INF/l10n/bundle.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/META-INF/l10n/bundle.properties
@@ -33,4 +33,4 @@ template.description.link = Link
template.description.linkWithTitle = Link with title
template.description.image = Image
-template.description.imageWithTitle = Image with title \ No newline at end of file
+template.description.imageWithTitle = Image with title
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/src/org/eclipse/mylyn/internal/wikitext/commonmark/ui/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/src/org/eclipse/mylyn/internal/wikitext/commonmark/ui/package-info.java
index 167f70118..e8f4f9bae 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/src/org/eclipse/mylyn/internal/wikitext/commonmark/ui/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.commonmark.ui/src/org/eclipse/mylyn/internal/wikitext/commonmark/ui/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 David Green.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/build.properties
index e544fe12f..33447c428 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -17,4 +19,4 @@ bin.includes = META-INF/,\
about.html,\
help/
-src.includes=about.html \ No newline at end of file
+src.includes=about.html
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.properties
index d719df8b6..521770f89 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2010 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -44,4 +46,4 @@ template.description.18 = Table heading
template.description.20 = {info} Info panel
template.description.21 = {note} Note panel
template.description.28 = {tip} Tip panel
-template.description.31 = {{monospace}} \ No newline at end of file
+template.description.31 = {{monospace}}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.xml
index d1599d871..7e8c74294 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2007, 2010 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/src/org/eclipse/mylyn/internal/wikitext/confluence/ui/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/src/org/eclipse/mylyn/internal/wikitext/confluence/ui/package-info.java
index b5499c270..d20dc72b7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/src/org/eclipse/mylyn/internal/wikitext/confluence/ui/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.confluence.ui/src/org/eclipse/mylyn/internal/wikitext/confluence/ui/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/about.html
index bc6e2b493..d47703fc7 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/build.properties
index 901dbd36e..4a2580e41 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/plugin.properties
index 053c7fd54..dbb20ff69 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingEditorTracker.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingEditorTracker.java
index 786d82ac3..29aff0359 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingEditorTracker.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingEditorTracker.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingListener.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingListener.java
index 9dc2c149e..ec26c7e50 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingListener.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/ActiveFoldingListener.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextStructureBridge.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextStructureBridge.java
index b4a1c022e..ba096a08d 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextStructureBridge.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextStructureBridge.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiBridge.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiBridge.java
index 36e2b7ceb..637505a50 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiBridge.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiBridge.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiPlugin.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiPlugin.java
index 191ba6e99..ffd42dff0 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiPlugin.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiPlugin.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiStartup.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiStartup.java
index 782111a25..564f4f6f9 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiStartup.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextContextUiStartup.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextUserInteractionMonitor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextUserInteractionMonitor.java
index 779021472..cff8575c8 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextUserInteractionMonitor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/WikiTextUserInteractionMonitor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/actions/ToggleActiveFoldingEditorActionDelegate.java b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/actions/ToggleActiveFoldingEditorActionDelegate.java
index b802605d4..3e95d6fb5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/actions/ToggleActiveFoldingEditorActionDelegate.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.context.ui/src/org/eclipse/mylyn/internal/wikitext/context/ui/actions/ToggleActiveFoldingEditorActionDelegate.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/about.html
index d774b07c7..df05931df 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 25, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/build.properties
index b27d4ebee..04f7c59c1 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Igor Malinin and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Igor Malinin - initial API and implementation
@@ -16,4 +18,4 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
-src.includes=about.html \ No newline at end of file
+src.includes=about.html
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/plugin.properties
index 2b724e388..370d8a33a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2011 Mylyn project committers and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Igor Malinin - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/src/org/eclipse/mylyn/internal/wikitext/creole/ui/packge-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/src/org/eclipse/mylyn/internal/wikitext/creole/ui/packge-info.java
index 2634e2e55..fd396f978 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/src/org/eclipse/mylyn/internal/wikitext/creole/ui/packge-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.creole.ui/src/org/eclipse/mylyn/internal/wikitext/creole/ui/packge-info.java
@@ -1,11 +1,13 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
*******************************************************************************/
-package org.eclipse.mylyn.internal.wikitext.creole.ui; \ No newline at end of file
+package org.eclipse.mylyn.internal.wikitext.creole.ui;
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/build.properties
index 90e3fb0f7..e21b16581 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2014 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/feature.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/feature.xml
index 00b6f182d..382ea8510 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/feature.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.editors-feature/feature.xml
@@ -6,7 +6,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.wikitext"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/build.properties
index 638844a02..f12e26a10 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2014 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.properties
index 7b5091c93..6181973cd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2014 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -12,4 +14,4 @@ label=Mylyn WikiText Extras
description=Extensions to the Mylyn WikiText framework, which enables parsing and display of lightweight markup (wiki text).\n\
Adds support for AsciiDoc, a CommonMark implementation of Markdown and Creole wiki markup.
providerName=Eclipse Mylyn
-copyright=Copyright (c) 2007, 2015 David Green and others. All rights reserved. \ No newline at end of file
+copyright=Copyright (c) 2007, 2015 David Green and others. All rights reserved.
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.xml
index 732860393..12ecb0688 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.extras-feature/feature.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2011, 2014 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
@@ -15,7 +17,7 @@
version="3.0.24.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build-helper.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build-helper.xml
index fe1af501d..38ac76f8e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build-helper.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build-helper.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2010 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
@@ -95,9 +97,9 @@
<header><![CDATA[Mylyn WikiText]]></header>
<bottom><![CDATA[<i>Copyright &#169; 2007, 2009 David Green and others.<br/>
All rights reserved. This program and the accompanying materials<br/>
- are made available under the terms of the Eclipse Public License v1.0<br/>
+ are made available under the terms of the Eclipse Public License v2.0<br/>
which accompanies this distribution, and is available at<br/>
- <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></i>]]></bottom>
+ <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a></i>]]></bottom>
<link href="http://java.sun.com/javase/6/docs/api/"/>
</javadoc>
<echo level="info">javadoc generation complete</echo>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build.properties
index 316a6d6fb..deb3323d3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009, 2012 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/customBuildCallbacks.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/customBuildCallbacks.xml
index 37d49c97e..4b8c1c564 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/customBuildCallbacks.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/customBuildCallbacks.xml
@@ -1,9 +1,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.properties
index 34e0dc401..514f3f1b8 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.properties
@@ -1,13 +1,15 @@
###############################################################################
# Copyright (c) 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
###############################################################################
#Properties file for org.eclipse.mylyn.wikitext.help.sdk
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText SDK Help \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText SDK Help
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.xml
index fb72c595b..4e7a09cac 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/plugin.xml
@@ -2,9 +2,11 @@
<?eclipse version="3.3"?><!--
Copyright (c) 2009 Tasktop Technologies and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Tasktop Technologies - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/toc.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/toc.xml
index da4730502..1b318dfec 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/toc.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.sdk/toc.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/build.properties
index fc3fdd373..83f955bd9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009, 2011 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/contextHelp.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/contextHelp.xml
index 704046bdf..c61bfc465 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/contextHelp.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/contextHelp.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/customBuildCallbacks.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/customBuildCallbacks.xml
index 6298b527a..a6dafee95 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/customBuildCallbacks.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/customBuildCallbacks.xml
@@ -1,9 +1,9 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/docs/new/new-3.1.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/docs/new/new-3.1.xml
index e9bf79ad9..9d9a3813d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/docs/new/new-3.1.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/docs/new/new-3.1.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
@@ -84,4 +86,4 @@
</description>
</item>
</category>
-</new> \ No newline at end of file
+</new>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn-WikiText-User-Guide.textile b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn-WikiText-User-Guide.textile
index 6de950f4f..cd1f32fa0 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn-WikiText-User-Guide.textile
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn-WikiText-User-Guide.textile
@@ -880,4 +880,4 @@ h2. Feedback
We're interested in any feedback that you might have. For patches, enhancement requests, bugs: "post an issue":https://bugs.eclipse.org/bugs under under Tools/Mylyn/WikiText.
p{font-style: italic;}. Copyright (c) 2008, 2013 David Green and others.
-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":http://www.eclipse.org/legal/epl-v10.html
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at "https://www.eclipse.org/legal/epl-2.0/":https://www.eclipse.org/legal/epl-2.0/
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText-Developer-Guide.textile b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText-Developer-Guide.textile
index ad3c62294..22c3ff892 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText-Developer-Guide.textile
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText-Developer-Guide.textile
@@ -260,4 +260,4 @@ Issues are tracked in "Eclipse Bugzilla":https://bugs.eclipse.org/bugs/ under th
p{font-style: italic;}. Copyright (c) 2008, 2012 David Green and others.
-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":http://www.eclipse.org/legal/epl-v10.html \ No newline at end of file
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at "https://www.eclipse.org/legal/epl-2.0/":https://www.eclipse.org/legal/epl-2.0/ \ No newline at end of file
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/examples/build-wikitext-to-dita.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/examples/build-wikitext-to-dita.xml
index 73929a367..28f9b37e8 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/examples/build-wikitext-to-dita.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/help/examples/build-wikitext-to-dita.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.properties
index f4deeedcf..e9fada5c1 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.properties
@@ -1,13 +1,15 @@
###############################################################################
# Copyright (c) 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
###############################################################################
#Properties file for org.eclipse.mylyn.wikitext.help.ui
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText Help UI \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText Help UI
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.xml
index 81d9668fc..24ed70134 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc-sdk.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc-sdk.xml
index 63da6c58a..69796afd5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc-sdk.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc-sdk.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc.xml
index 2a7533d9e..59c2c52b6 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.help.ui/toc.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/about.html
index d774b07c7..df05931df 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 25, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/build.properties
index 6d4e2487c..53ce9f8d7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2013 Stefan Seelmann and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Stefan Seelmann - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/plugin.properties
index 6ea824f04..fe6994f80 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.markdown.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012, 2013 Stefan Seelmann and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Stefan Seelmann - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/build.properties
index d9a584b63..1cdb5e1fb 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.properties
index 16f2ecdba..ca5943f19 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -28,4 +30,4 @@ template.description.14 = [http://www.eclipse.org/mylyn]
Bundle-Vendor.0 = Eclipse Mylyn
Bundle-Name.0 = Mylyn WikiText MediaWiki UI
content-type.name.0 = MediaWiki WikiText Markup
-template.description.14 = comment \ No newline at end of file
+template.description.14 = comment
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.xml
index acabf2ef4..2cb067c8f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/src/org/eclipse/mylyn/internal/wikitext/mediawiki/ui/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/src/org/eclipse/mylyn/internal/wikitext/mediawiki/ui/package-info.java
index 0203182a4..03b59d1e1 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/src/org/eclipse/mylyn/internal/wikitext/mediawiki/ui/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.mediawiki.ui/src/org/eclipse/mylyn/internal/wikitext/mediawiki/ui/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/about.html
index da126e466..193bdda08 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/build.properties
index d849abc3d..2b9c035f8 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/MockMarkupLanguage.java b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/MockMarkupLanguage.java
index 9726a6e44..a16cbe70a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/MockMarkupLanguage.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/MockMarkupLanguage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocatorTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocatorTest.java
index da5f9aaed..6bce10b3e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocatorTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi.tests/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocatorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/META-INF/l10n/bundle.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/META-INF/l10n/bundle.properties
index b39bf8142..fc572a522 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/META-INF/l10n/bundle.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/META-INF/l10n/bundle.properties
@@ -1,10 +1,12 @@
###############################################################################
# Copyright (c) 2013, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
#Properties file for org.eclipse.mylyn.wikitext.osgi
Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn WikiText OSGi Plug-in \ No newline at end of file
+Bundle-Name = Mylyn WikiText OSGi Plug-in
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/about.html
index da126e466..193bdda08 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/build.properties
index 33ce1b6cd..c3224503c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocator.java b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocator.java
index 33a51c057..530d74066 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocator.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/OsgiServiceLocator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/package-info.java
index 9a9b86a84..204edb39e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.osgi/src/org/eclipse/mylyn/wikitext/core/osgi/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/build.properties
index 1e60e1aee..527c00869 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009, 2014 Tasktop Technologies and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Tasktop Technologies - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.properties
index 04d8f9cfd..4d6769531 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009, 2014 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml
index e5ce5fe4c..c8ba008df 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml
@@ -2,9 +2,11 @@
<!--
Copyright (c) 2009, 2014 Tasktop Technologies and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Tasktop Technologies - initial API and implementation
@@ -16,7 +18,7 @@
provider-name="%providerName"
plugin="org.eclipse.mylyn.wikitext"
license-feature="org.eclipse.license"
- license-feature-version="1.0.1">
+ license-feature-version="2.0.0">
<description>
%description
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/build.properties
index b4b4e53db..c9dc76eec 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.properties
index fd065ef70..ea74ae8cb 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.xml
index 48251d863..f6c68282e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2007, 2013 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/WikiTextTasksUiPlugin.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/WikiTextTasksUiPlugin.java
index 78006cb65..7536459db 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/WikiTextTasksUiPlugin.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/WikiTextTasksUiPlugin.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/commands/IncrementalFindHandler.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/commands/IncrementalFindHandler.java
index e737099fa..d636ac6e2 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/commands/IncrementalFindHandler.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/commands/IncrementalFindHandler.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011, 2012 Tasktopp Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/ConfluenceMarkupTaskEditorExtension.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/ConfluenceMarkupTaskEditorExtension.java
index 1f73753fe..eaf562001 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/ConfluenceMarkupTaskEditorExtension.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/ConfluenceMarkupTaskEditorExtension.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MarkdownMarkupTaskEditorExtension.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MarkdownMarkupTaskEditorExtension.java
index a4c040c6d..16dea421b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MarkdownMarkupTaskEditorExtension.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MarkdownMarkupTaskEditorExtension.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 Daniel Deady and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Daniel Deady <daniel@clockworkgeek.com> - Bug 438968
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MediaWikiMarkupTaskEditorExtension.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MediaWikiMarkupTaskEditorExtension.java
index 9ca6eb936..7d3ddc3e9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MediaWikiMarkupTaskEditorExtension.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/MediaWikiMarkupTaskEditorExtension.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TWikiMarkupTaskEditorExtension.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TWikiMarkupTaskEditorExtension.java
index c6946225e..bc2980dfb 100755
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TWikiMarkupTaskEditorExtension.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TWikiMarkupTaskEditorExtension.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TextileMarkupTaskEditorExtension.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TextileMarkupTaskEditorExtension.java
index 43d3d1dfd..5e4e13bcd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TextileMarkupTaskEditorExtension.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TextileMarkupTaskEditorExtension.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TracWikiMarkupTaskEditorExtension.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TracWikiMarkupTaskEditorExtension.java
index fc4904192..4002326df 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TracWikiMarkupTaskEditorExtension.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/editor/TracWikiMarkupTaskEditorExtension.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/MarkupViewerPreferencePage.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/MarkupViewerPreferencePage.java
index 491c11b62..92f8768cf 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/MarkupViewerPreferencePage.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/MarkupViewerPreferencePage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/Messages.java
index 1390deb02..62e5f3e12 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/messages.properties
index f7725aeb5..c5186f8e4 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/preferences/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/Util.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/Util.java
index aaf9e165d..484d400d3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/Util.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/Util.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaGeneratedCommentBlock.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaGeneratedCommentBlock.java
index b1ffecb17..6f66d7a2e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaGeneratedCommentBlock.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaGeneratedCommentBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaQuoteBlock.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaQuoteBlock.java
index 0b96c1250..8ad427f8b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaQuoteBlock.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/internal/wikitext/tasks/ui/util/bugzilla/BugzillaQuoteBlock.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/MarkupTaskEditorExtension.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/MarkupTaskEditorExtension.java
index 7a1fca0a8..1438edc46 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/MarkupTaskEditorExtension.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/MarkupTaskEditorExtension.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/package-info.java
index f3817dd27..24398ef27 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/build.properties
index e544fe12f..33447c428 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -17,4 +19,4 @@ bin.includes = META-INF/,\
about.html,\
help/
-src.includes=about.html \ No newline at end of file
+src.includes=about.html
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.properties
index 1c2210b8d..1b3368e2e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -47,4 +49,4 @@ template.description.31 = Table
template.description.32 = Table heading
template.description.33 = Image
template.description.34 = Hyperlink with title
-template.description.35 = %span% \ No newline at end of file
+template.description.35 = %span%
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.xml
index 20447d7d4..cc4573487 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/src/org/eclipse/mylyn/internal/wikitext/textile/ui/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/src/org/eclipse/mylyn/internal/wikitext/textile/ui/package-info.java
index 697adfe5b..558b5be1f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/src/org/eclipse/mylyn/internal/wikitext/textile/ui/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.textile.ui/src/org/eclipse/mylyn/internal/wikitext/textile/ui/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/build.properties
index 243be2c54..a63d5ca96 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -16,4 +18,4 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
-src.includes=about.html \ No newline at end of file
+src.includes=about.html
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.properties
index 467f6d061..e7434f2aa 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -37,4 +39,4 @@ template.description.20 = Citation
template.description.21 = Table
template.description.22 = line break
-content-type.name.0 = TracWiki WikiText Markup \ No newline at end of file
+content-type.name.0 = TracWiki WikiText Markup
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.xml
index c49151571..73b96d713 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/src/org/eclipse/mylyn/internal/wikitext/tracwiki/ui/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/src/org/eclipse/mylyn/internal/wikitext/tracwiki/ui/package-info.java
index 809d3f6e7..91f4aafc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/src/org/eclipse/mylyn/internal/wikitext/tracwiki/ui/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.tracwiki.ui/src/org/eclipse/mylyn/internal/wikitext/tracwiki/ui/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/about.html
index d774b07c7..df05931df 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 25, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/build.properties
index 243be2c54..a63d5ca96 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -16,4 +18,4 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
-src.includes=about.html \ No newline at end of file
+src.includes=about.html
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.properties
index efc2469c2..6bda17375 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 Mylyn project committers and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -30,4 +32,4 @@ template.description.14 = List (roman numeric)
template.description.15 = Definition List
template.description.16 = Verbatim
template.description.17 = Literal
-template.description.18 = separator (horizontal rule) \ No newline at end of file
+template.description.18 = separator (horizontal rule)
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.xml
index f576b7683..7ce780687 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/src/org/eclipse/mylyn/internal/wikitext/twiki/ui/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/src/org/eclipse/mylyn/internal/wikitext/twiki/ui/package-info.java
index cc1d0ced6..f50c42b5f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/src/org/eclipse/mylyn/internal/wikitext/twiki/ui/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.twiki.ui/src/org/eclipse/mylyn/internal/wikitext/twiki/ui/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/build.properties
index e3e48927a..ebd5e1f6e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2011 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/plugin.properties
index 89bdeb1b6..a51442045 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 Mylyn project committers and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -11,4 +13,4 @@
#Properties file for org.eclipse.mylyn.wikitext.tests
Bundle-Vendor.0 = Eclipse Mylyn
-Bundle-Name.0 = Mylyn WikiText Tests Plug-in \ No newline at end of file
+Bundle-Name.0 = Mylyn WikiText Tests Plug-in
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java
index 597a2937a..77d099c6c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileRefHyperlinkDetectorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Simon Scholz and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Simon Scholz - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileTypesTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileTypesTest.java
index ef1b6c865..e76232fb6 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileTypesTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/FileTypesTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/ScreenshotOnTimeoutRule.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/ScreenshotOnTimeoutRule.java
index 164f03d7d..1fc05ad47 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/ScreenshotOnTimeoutRule.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/ScreenshotOnTimeoutRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/AbstractDocumentTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/AbstractDocumentTest.java
index 8e5a22cbf..8f252484f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/AbstractDocumentTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/AbstractDocumentTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/DialectDocumentProviderTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/DialectDocumentProviderTest.java
index 72561c971..3f73650d2 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/DialectDocumentProviderTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/DialectDocumentProviderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitionerTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitionerTest.java
index a6720a63a..a2fa48598 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitionerTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitionerTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScannerTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScannerTest.java
index 37e9ee233..987339475 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScannerTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScannerTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocatorTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocatorTest.java
index fadf151fc..3d1ece228 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocatorTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocatorTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextTest.java
index 10dc0dfcc..b6f8505b1 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactoryTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactoryTest.java
index 0d97d9d52..f85a0f414 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactoryTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactoryTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapterTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapterTest.java
index 67641db62..b2721f258 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapterTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapterTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManagerTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManagerTest.java
index dd7a6864d..b07c852cd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManagerTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManagerTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParserTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParserTest.java
index 73ab56b2d..fdc4b6bc5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParserTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/ConfigurationBuilderTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/ConfigurationBuilderTest.java
index 7e1667953..55a5a25fd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/ConfigurationBuilderTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/ConfigurationBuilderTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageConfigurationTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageConfigurationTest.java
index 1326ca367..8ee80b406 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageConfigurationTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageConfigurationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageTest.java
index df9b2f3c8..2fc13dbf0 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/MarkupLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/EntityWrappingReplacementTokenTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/EntityWrappingReplacementTokenTest.java
index efb379cba..56fb4f475 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/EntityWrappingReplacementTokenTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/EntityWrappingReplacementTokenTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/ImpliedHyperlinkReplacementTokenTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/ImpliedHyperlinkReplacementTokenTest.java
index 23d6ebabb..1376f5c0a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/ImpliedHyperlinkReplacementTokenTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/markup/token/ImpliedHyperlinkReplacementTokenTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineItemTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineItemTest.java
index 665e0257b..b93b96391 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineItemTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineItemTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineParserTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineParserTest.java
index b31e1edcc..5cb0b2f7b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineParserTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/outline/OutlineParserTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/MarkupToEclipseTocTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/MarkupToEclipseTocTest.java
index 60d8084f5..28820e55a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/MarkupToEclipseTocTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/MarkupToEclipseTocTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/TextileToDocbookTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/TextileToDocbookTest.java
index d357060f1..0723db1f7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/TextileToDocbookTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/parser/util/TextileToDocbookTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/util/ServiceLocatorIntegrationTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/util/ServiceLocatorIntegrationTest.java
index a9e1a2b42..4bce8ee88 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/util/ServiceLocatorIntegrationTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/core/util/ServiceLocatorIntegrationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/AbstractTestInWorkspace.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/AbstractTestInWorkspace.java
index 92c0891d4..ef8a70bc3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/AbstractTestInWorkspace.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/AbstractTestInWorkspace.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassFilter.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassFilter.java
index 24a349847..5ddac2047 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassFilter.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassFilter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassTraversal.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassTraversal.java
index b52b36085..bfceae846 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassTraversal.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/ClassTraversal.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/DiscoveryTestSuite.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/DiscoveryTestSuite.java
index a7b03bb46..c6094d01a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/DiscoveryTestSuite.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/DiscoveryTestSuite.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/EclipseRuntimeRequired.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/EclipseRuntimeRequired.java
index f7bf0fe1f..7b172a3b0 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/EclipseRuntimeRequired.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/EclipseRuntimeRequired.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadRequired.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadRequired.java
index f85f9bd83..d0ba7ccb8 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadRequired.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadRequired.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessStandaloneTests.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessStandaloneTests.java
index b0e112f81..ba752c510 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessStandaloneTests.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessStandaloneTests.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessTests.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessTests.java
index 439662ac3..9f04c9c4b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessTests.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/HeadlessTests.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/NoDiscovery.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/NoDiscovery.java
index 9e7a19640..9d0ae34dd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/NoDiscovery.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/NoDiscovery.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/TestUtil.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/TestUtil.java
index af8a9ca43..7c08718ef 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/TestUtil.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/TestUtil.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/UITests.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/UITests.java
index 2574f85db..1461e47fe 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/UITests.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/tests/UITests.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/BugzillaTextileLanguageTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/BugzillaTextileLanguageTest.java
index 501bc798f..8d09c2a33 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/BugzillaTextileLanguageTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/BugzillaTextileLanguageTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/TextileLanguageTasksTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/TextileLanguageTasksTest.java
index a3dd075f6..fb71e7644 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/TextileLanguageTasksTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/textile/TextileLanguageTasksTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotationTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotationTest.java
index 825e91399..cabcc49a1 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotationTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotationTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotationTest.java
index 264f838f7..2ce6395a3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotationTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotationTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotationTest.java
index 62cdfd54e..d5c4c4533 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotationTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotationTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotationTest.java
index 0cb1b8feb..68601b36a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotationTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotationTest.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotationTest.java
index 4e8f16775..ede5c2a3c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotationTest.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui.tests/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotationTest.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/about.html b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/about.html
index bc6e2b493..d47703fc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/about.html
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/about.html
@@ -7,13 +7,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>July 3, 2008</p>
+<p>April 4, 2018</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/build.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/build.properties
index 0d233beb4..ccbead2a7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/build.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.properties
index 02179b61d..a7dcdaa01 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
@@ -61,4 +63,4 @@ extension.name = WikiText Nature
extension.name.0 = WikiText Validation
extension-point.name = Markup Language Cheat Seet
extension-point.name.0 = Markup Language Content Assist
-relativeFilePathHyperlinkDetector-extension-point.name = File reference regex hyperlink detector extension point \ No newline at end of file
+relativeFilePathHyperlinkDetector-extension-point.name = File reference regex hyperlink detector extension point
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.xml b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.xml
index 2dbc2caea..a191e774d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.xml
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/plugin.xml
@@ -3,9 +3,11 @@
<!--
Copyright (c) 2007, 2013 David Green and others.
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/cheatSheet.exsd b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/cheatSheet.exsd
index 3d14c2ce2..2aa12bba3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/cheatSheet.exsd
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/cheatSheet.exsd
@@ -129,9 +129,9 @@ in this way the user is presented with the most locale-specific help resource.
<documentation>
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+https://www.eclipse.org/legal/epl-2.0/
</documentation>
</annotation>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/contentAssist.exsd b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/contentAssist.exsd
index 83a0a9cda..c8065f334 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/contentAssist.exsd
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/contentAssist.exsd
@@ -159,9 +159,9 @@ If the template needs trailing whitespace it should be terminated with the &apos
<documentation>
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+https://www.eclipse.org/legal/epl-2.0/
</documentation>
</annotation>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupLanguage.exsd b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupLanguage.exsd
index 0052c6929..af04ddad4 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupLanguage.exsd
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupLanguage.exsd
@@ -148,9 +148,9 @@ Generally markup language declarations are also followed by the following:
<documentation>
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+https://www.eclipse.org/legal/epl-2.0/
</documentation>
</annotation>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupValidationRule.exsd b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupValidationRule.exsd
index 9f302bcd7..f93d33009 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupValidationRule.exsd
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/markupValidationRule.exsd
@@ -103,9 +103,9 @@
<documentation>
Copyright (c) 2007, 2009 David Green and others.
All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+https://www.eclipse.org/legal/epl-2.0/
</documentation>
</annotation>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/relativeFilePathHyperlinkDetector.exsd b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/relativeFilePathHyperlinkDetector.exsd
index f19d1fc39..873dac85a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/relativeFilePathHyperlinkDetector.exsd
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/schema/relativeFilePathHyperlinkDetector.exsd
@@ -132,9 +132,9 @@
<documentation>
Copyright (c) 2016 Simon Scholz and others.
All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+https://www.eclipse.org/legal/epl-2.0/
</documentation>
</annotation>
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/Messages.java
index efcb2d2b0..f19ada548 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextNature.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextNature.java
index 8246e47dc..5be65a11c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextNature.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextNature.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextUiPlugin.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextUiPlugin.java
index a64c35589..3deb569f3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextUiPlugin.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/WikiTextUiPlugin.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/ConvertMarkupToMarkup.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/ConvertMarkupToMarkup.java
index 3ccc320b2..efac83bf4 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/ConvertMarkupToMarkup.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/ConvertMarkupToMarkup.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/Messages.java
index 66fe33b09..0d2e20787 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/WikiMarkupGenerationContribution.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/WikiMarkupGenerationContribution.java
index f26e56dd8..4ef5f3513 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/WikiMarkupGenerationContribution.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/WikiMarkupGenerationContribution.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/messages.properties
index 40b8c5038..93f8f5abc 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/commands/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FindAndReplaceTarget.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FindAndReplaceTarget.java
index 06dd33d7a..8b28d7f19 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FindAndReplaceTarget.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FindAndReplaceTarget.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 Tasktop Technologies.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FoldingStructure.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FoldingStructure.java
index 94e0a6113..47db9ce6d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FoldingStructure.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/FoldingStructure.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -241,4 +243,4 @@ class FoldingStructure implements IFoldingStructure {
return viewer.getProjectionAnnotationModel() != null;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/HeadingProjectionAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/HeadingProjectionAnnotation.java
index 49bcaaaa4..f6f9f14c2 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/HeadingProjectionAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/HeadingProjectionAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -26,4 +28,4 @@ class HeadingProjectionAnnotation extends ProjectionAnnotation {
public String getHeadingId() {
return headingId;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/IFoldingStructure.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/IFoldingStructure.java
index 60979924c..5bc3baefc 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/IFoldingStructure.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/IFoldingStructure.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditor.java
index f26339125..844b1d756 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2016 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorActionBarContributor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorActionBarContributor.java
index 901690dde..5958e5485 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorActionBarContributor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorActionBarContributor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorOutline.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorOutline.java
index 73f24e08b..e45f5d0c9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorOutline.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupEditorOutline.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupProjectionViewer.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupProjectionViewer.java
index 28f57681d..560ed3796 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupProjectionViewer.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/MarkupProjectionViewer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -66,4 +68,4 @@ public class MarkupProjectionViewer extends ProjectionViewer {
outlinePresenter.install(this);
}
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/Messages.java
index 7a982cd40..0cf4f09f5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/CollapseAllFoldingRulerAction.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/CollapseAllFoldingRulerAction.java
index eccf859b4..e6689d475 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/CollapseAllFoldingRulerAction.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/CollapseAllFoldingRulerAction.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -31,4 +33,4 @@ public class CollapseAllFoldingRulerAction extends AbstractRulerActionDelegate {
action.setActionDefinitionId(IFoldingCommandIds.FOLDING_COLLAPSE_ALL);
return action;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ContextHelpAction.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ContextHelpAction.java
index bc81d89db..8f6461c1c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ContextHelpAction.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ContextHelpAction.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ExpandAllFoldingRulerAction.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ExpandAllFoldingRulerAction.java
index b0aa1ad42..0e3944a4b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ExpandAllFoldingRulerAction.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ExpandAllFoldingRulerAction.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -31,4 +33,4 @@ public class ExpandAllFoldingRulerAction extends AbstractRulerActionDelegate {
action.setActionDefinitionId(IFoldingCommandIds.FOLDING_EXPAND_ALL);
return action;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/Messages.java
index 07067fe4d..ce39fc3aa 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2012 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/PreviewOutlineItemAction.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/PreviewOutlineItemAction.java
index f5291524d..70df4b50a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/PreviewOutlineItemAction.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/PreviewOutlineItemAction.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/SetMarkupLanguageAction.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/SetMarkupLanguageAction.java
index fa677d089..fb97ed53e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/SetMarkupLanguageAction.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/SetMarkupLanguageAction.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ToggleFoldingRulerAction.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ToggleFoldingRulerAction.java
index 0e4d181e3..fa279820e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ToggleFoldingRulerAction.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/ToggleFoldingRulerAction.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/messages.properties
index 607be63b7..a8c3ea6a4 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/actions/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2012 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/AnchorCompletionProcessor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/AnchorCompletionProcessor.java
index f0fd20a1a..f41e1200d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/AnchorCompletionProcessor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/AnchorCompletionProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MarkupTemplateCompletionProcessor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MarkupTemplateCompletionProcessor.java
index fba52ed78..744c3c499 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MarkupTemplateCompletionProcessor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MarkupTemplateCompletionProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Messages.java
index 0a0fc1d3c..f98cb3047 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MultiplexingContentAssistProcessor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MultiplexingContentAssistProcessor.java
index c3b8ed2ef..9686690e5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MultiplexingContentAssistProcessor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/MultiplexingContentAssistProcessor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/SourceTemplateContextType.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/SourceTemplateContextType.java
index 5fd587c5c..814d8e6e3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/SourceTemplateContextType.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/SourceTemplateContextType.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Templates.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Templates.java
index f04e9111e..1ea2cd753 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Templates.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/Templates.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/WikiTextTemplateAccess.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/WikiTextTemplateAccess.java
index 859f14a94..355b52ceb 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/WikiTextTemplateAccess.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/WikiTextTemplateAccess.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/messages.properties
index 23ff6a411..165076992 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/assist/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/Messages.java
index 08e939720..cd7e39cdc 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowCheatSheetCommand.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowCheatSheetCommand.java
index aa7d477c4..b5799ef3f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowCheatSheetCommand.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowCheatSheetCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowQuickOutlineCommand.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowQuickOutlineCommand.java
index 8dfaba93c..bdc5024ef 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowQuickOutlineCommand.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/ShowQuickOutlineCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/messages.properties
index 032f815c9..da66936ff 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/commands/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/DndConfigurationStrategy.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/DndConfigurationStrategy.java
index 4fb7bc253..793b8c461 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/DndConfigurationStrategy.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/DndConfigurationStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/Messages.java
index bca985589..eda8eb4bb 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDragSourceListener.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDragSourceListener.java
index 400a5ec54..74d3955d8 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDragSourceListener.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDragSourceListener.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDropTargetListener.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDropTargetListener.java
index c85d3edce..faab3ccfe 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDropTargetListener.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/OutlineDropTargetListener.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/messages.properties
index cee5555ed..8e2de4695 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/dnd/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/CheatSheetContent.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/CheatSheetContent.java
index 2986863f9..b7b560269 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/CheatSheetContent.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/CheatSheetContent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/HelpContent.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/HelpContent.java
index 7941d2280..00d7c2aa5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/HelpContent.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/HelpContent.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/Messages.java
index 1acb62975..29abb4864 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/messages.properties
index c576a360a..beae09477 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/help/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/messages.properties
index bf597d1f8..a1abc7047 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2014 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/AbstractDocumentCommand.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/AbstractDocumentCommand.java
index ae48c1f3b..c2c01d58d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/AbstractDocumentCommand.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/AbstractDocumentCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/CommandManager.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/CommandManager.java
index 1c3a86d30..21df65b37 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/CommandManager.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/CommandManager.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/InsertLocation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/InsertLocation.java
index 6ebf93ee7..61a112a72 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/InsertLocation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/InsertLocation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/Messages.java
index 7cd4f1aab..1591c28e8 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/MoveSectionsCommand.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/MoveSectionsCommand.java
index 3ab1a1092..6d2940f9f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/MoveSectionsCommand.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/MoveSectionsCommand.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/messages.properties
index c73f3ebe7..f76787458 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/operations/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/Messages.java
index d64650dec..d914118ad 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/QuickOutlinePopupDialog.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/QuickOutlinePopupDialog.java
index d1652ce19..dd9eda800 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/QuickOutlinePopupDialog.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/QuickOutlinePopupDialog.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/messages.properties
index 56c841ddb..2ffb96952 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/outline/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/CssStyleFieldEditor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/CssStyleFieldEditor.java
index c2f00e8f4..347d20846 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/CssStyleFieldEditor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/CssStyleFieldEditor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/EditorPreferencePage.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/EditorPreferencePage.java
index 973ca6b8c..0dd61b56f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/EditorPreferencePage.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/EditorPreferencePage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -136,4 +138,4 @@ public class EditorPreferencePage extends FieldEditorPreferencePage implements I
public void init(IWorkbench workbench) {
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Messages.java
index 03cb4005e..e4f86627e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/PreferenceInitializer.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/PreferenceInitializer.java
index 21aaa788b..90ae0b25b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/PreferenceInitializer.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/PreferenceInitializer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Preferences.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Preferences.java
index 710b956bf..8d6daf0ee 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Preferences.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/Preferences.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/WikiTextTemplatePreferencePage.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/WikiTextTemplatePreferencePage.java
index 4d34e2a7d..bdb7171f5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/WikiTextTemplatePreferencePage.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/WikiTextTemplatePreferencePage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/messages.properties
index 000dc1408..a2e8eca1a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/preferences/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupMonoReconciler.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupMonoReconciler.java
index 69d152f79..d1460df7a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupMonoReconciler.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupMonoReconciler.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupValidationReconcilingStrategy.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupValidationReconcilingStrategy.java
index f5aff053a..580efcb9e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupValidationReconcilingStrategy.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MarkupValidationReconcilingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MultiReconcilingStrategy.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MultiReconcilingStrategy.java
index b2ce1d44d..a1fd0b025 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MultiReconcilingStrategy.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/reconciler/MultiReconcilingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Block.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Block.java
index 8cfbdccad..51e04762e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Block.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Block.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/EditFileHyperlink.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/EditFileHyperlink.java
index 6b7a560f5..f4126bbda 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/EditFileHyperlink.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/EditFileHyperlink.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -57,4 +59,4 @@ public class EditFileHyperlink implements IHyperlink {
NLS.bind(Messages.MarkupHyperlinkDetector_openException, file.getName(), e.getMessage()));
}
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitioner.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitioner.java
index 7a7b62156..c192d988e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitioner.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FastMarkupPartitioner.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FileRefHyperlinkDetector.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FileRefHyperlinkDetector.java
index 147dd7f75..72b30adc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FileRefHyperlinkDetector.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/FileRefHyperlinkDetector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Simon Scholz and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Simon Scholz - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDamagerRepairer.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDamagerRepairer.java
index 1e53598e5..be507f226 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDamagerRepairer.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDamagerRepairer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDocumentProvider.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDocumentProvider.java
index a650f95d4..331487a40 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDocumentProvider.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupDocumentProvider.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupHyperlinkDetector.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupHyperlinkDetector.java
index a6ff7f84b..caff1f34d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupHyperlinkDetector.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupHyperlinkDetector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2010, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScanner.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScanner.java
index 9864cfb51..344151e76 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScanner.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/MarkupTokenScanner.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Messages.java
index 35d826039..dc3311663 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segment.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segment.java
index 0846ed0f2..d6c1c2429 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segment.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segment.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segments.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segments.java
index 5290e33e6..ce0e11b6c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segments.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Segments.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Span.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Span.java
index b8fa896e9..7e8706bc7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Span.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/Span.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/messages.properties
index 1808dafbc..43394021e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/syntax/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2010 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/AnnotationMarkupValidator.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/AnnotationMarkupValidator.java
index b1f9710c7..dac3bfb6f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/AnnotationMarkupValidator.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/AnnotationMarkupValidator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/DocumentRegionValidator.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/DocumentRegionValidator.java
index c880d494b..1fd7236c9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/DocumentRegionValidator.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/DocumentRegionValidator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/Messages.java
index beb28e439..c648c0b7c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ResourceMarkerMarkupValidator.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ResourceMarkerMarkupValidator.java
index dbed6a64d..ff3c25c71 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ResourceMarkerMarkupValidator.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ResourceMarkerMarkupValidator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ValidationProblemAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ValidationProblemAnnotation.java
index 288371e3a..72e279fb4 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ValidationProblemAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/ValidationProblemAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/messages.properties
index ceeb0e2fc..f8e4357ad 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/editor/validation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/messages.properties
index b60c647cb..72cf4f06a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/Messages.java
index a059e4995..07bbcefdd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/ProjectPropertyPage.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/ProjectPropertyPage.java
index 706eb3ef5..600245afc 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/ProjectPropertyPage.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/ProjectPropertyPage.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2014 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/messages.properties
index b1495c1bd..665ec5608 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/properties/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocator.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocator.java
index 2d2604ee5..767f1ae24 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocator.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/EclipseServiceLocator.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/Messages.java
index 8ee7fce90..119b0f0cd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextExtensionPointReader.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextExtensionPointReader.java
index 7a04653d2..982701baa 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextExtensionPointReader.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/WikiTextExtensionPointReader.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/messages.properties
index a620db401..8096f9ce9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/registry/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2013 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/HyperlinkDetectorDelegate.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/HyperlinkDetectorDelegate.java
index e58fe7d75..5b6dac733 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/HyperlinkDetectorDelegate.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/HyperlinkDetectorDelegate.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -95,4 +97,4 @@ public class HyperlinkDetectorDelegate
public int getStateMask() {
return stateMask;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/IOUtil.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/IOUtil.java
index 873404c43..c90403b2b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/IOUtil.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/IOUtil.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2013, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/ImageCache.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/ImageCache.java
index 97b75420f..30d1910db 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/ImageCache.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/ImageCache.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/InformationPresenterUtil.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/InformationPresenterUtil.java
index a78a339e5..4365f638d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/InformationPresenterUtil.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/InformationPresenterUtil.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/NlsResourceBundle.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/NlsResourceBundle.java
index 59bb37136..d60e98e88 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/NlsResourceBundle.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/NlsResourceBundle.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactory.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactory.java
index 38ec2731b..a7c12a5b2 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactory.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemAdapterFactory.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapter.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapter.java
index 1f07ea627..520141ff3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapter.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/OutlineItemWorkbenchAdapter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/PreferenceStoreFacade.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/PreferenceStoreFacade.java
index bba5f2e7c..b4c9732fa 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/PreferenceStoreFacade.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/PreferenceStoreFacade.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/WikiTextUiResources.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/WikiTextUiResources.java
index d12f26fe9..978d31969 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/WikiTextUiResources.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/WikiTextUiResources.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/Colors.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/Colors.java
index 2fbdbcdf2..4010fa041 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/Colors.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/Colors.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentDamagerRepairer.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentDamagerRepairer.java
index 94447b280..032e42267 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentDamagerRepairer.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentDamagerRepairer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentRule.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentRule.java
index 4b6009284..61ce694ab 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentRule.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CommentRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssBlockScanner.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssBlockScanner.java
index c7920f55c..bc4197677 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssBlockScanner.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssBlockScanner.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssConfiguration.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssConfiguration.java
index 8dc22f60d..6374213a9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssConfiguration.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitionScanner.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitionScanner.java
index 5c51d49bb..548b25235 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitionScanner.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitionScanner.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitioner.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitioner.java
index 69ffeef3b..84a3a2478 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitioner.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssPartitioner.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssScanner.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssScanner.java
index 93bfa4264..45557bd29 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssScanner.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssScanner.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssWhitespaceDetector.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssWhitespaceDetector.java
index fa588f18d..e07114cb4 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssWhitespaceDetector.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/CssWhitespaceDetector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyNameRule.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyNameRule.java
index b5b6117fc..c1b15539b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyNameRule.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyNameRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyValueRule.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyValueRule.java
index 697ea0e0b..bcc6bc62b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyValueRule.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/PropertyValueRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/SelectorRule.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/SelectorRule.java
index fba2395fb..2680656d5 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/SelectorRule.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/SelectorRule.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/package-info.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/package-info.java
index 5b33f657f..4300ddd03 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/package-info.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/util/css/editor/package-info.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/Messages.java
index eb9ba5c2c..4ee8008f7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/ValidationProjectBuilder.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/ValidationProjectBuilder.java
index feba21fda..e414037cd 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/ValidationProjectBuilder.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/ValidationProjectBuilder.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/messages.properties
index cb85b03ab..abd26c03c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/validation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/AnnotationHyperlinkDetector.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/AnnotationHyperlinkDetector.java
index 0476b37ed..ac8ac079f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/AnnotationHyperlinkDetector.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/AnnotationHyperlinkDetector.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManager.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManager.java
index 80774c281..a804e406f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManager.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/CssStyleManager.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/FontState.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/FontState.java
index f554714d7..684dcb8f9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/FontState.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/FontState.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -201,4 +203,4 @@ public class FontState {
return true;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParser.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParser.java
index 6c9733786..fa42eb5ef 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParser.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/HtmlTextPresentationParser.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -1104,4 +1106,4 @@ public class HtmlTextPresentationParser {
this.imageCache = imageCache;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/ImageManager.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/ImageManager.java
index 498c9c282..805f126a6 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/ImageManager.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/ImageManager.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Messages.java
index a0ebb3e9e..18a8cd485 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/TextHover.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/TextHover.java
index b8ab66e00..de06d1d11 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/TextHover.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/TextHover.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2010 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -154,4 +156,4 @@ public class TextHover extends DefaultTextHover implements ITextHoverExtension {
return null;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Util.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Util.java
index c8ad16253..7abcb22a7 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Util.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/Util.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletAnnotation.java
index 350b4c830..20dd8ff5d 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletDrawingStrategy.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletDrawingStrategy.java
index 5eb2a82ac..97fe93f8b 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletDrawingStrategy.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/BulletDrawingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleAnnotation.java
index 30f202ea5..b25fddbba 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleDrawingStrategy.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleDrawingStrategy.java
index b890360d1..f2f0808a3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleDrawingStrategy.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/HorizontalRuleDrawingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageAnnotation.java
index 04f0e4b5e..6d027abad 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageDrawingStrategy.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageDrawingStrategy.java
index 1e806b1ac..9af773599 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageDrawingStrategy.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/annotation/ImageDrawingStrategy.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/messages.properties
index 25639375a..3fab69754 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/internal/wikitext/ui/viewer/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/WikiText.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/WikiText.java
index da0e9b4f0..73de807d2 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/WikiText.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/WikiText.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotation.java
index bd75f144d..08f20e6bc 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorHrefAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotation.java
index a2df4d820..84d142180 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/AnchorNameAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotation.java
index e326ceb08..0f01c4b1c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/ClassAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotation.java
index dacfc5853..89764e16f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/IdAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotation.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotation.java
index c05be407f..094aea08f 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotation.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/annotation/TitleAnnotation.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/AbstractMarkupResourceHandler.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/AbstractMarkupResourceHandler.java
index ddbeabe47..8136ae240 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/AbstractMarkupResourceHandler.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/AbstractMarkupResourceHandler.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToDocbook.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToDocbook.java
index 0828ac664..b0c511309 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToDocbook.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToDocbook.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToEclipseHelp.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToEclipseHelp.java
index b581f8d22..5ec677adc 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToEclipseHelp.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToEclipseHelp.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToHtml.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToHtml.java
index fb944c246..32507c0ca 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToHtml.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/ConvertMarkupToHtml.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/Messages.java
index 038bd9be8..b75316c45 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/messages.properties
index 40bf05d11..43d5a0322 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/commands/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextDocumentProvider.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextDocumentProvider.java
index 35162eddb..ab1ba09d4 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextDocumentProvider.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextDocumentProvider.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextSourceEditorOutline.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextSourceEditorOutline.java
index 0a749f6ed..4ac666f43 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextSourceEditorOutline.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/AbstractWikiTextSourceEditorOutline.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/DefaultWikiTextSourceEditorOutline.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/DefaultWikiTextSourceEditorOutline.java
index b6494b340..1f9d4f3c6 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/DefaultWikiTextSourceEditorOutline.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/DefaultWikiTextSourceEditorOutline.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewer.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewer.java
index f66a78d5a..1ada57b07 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewer.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -117,4 +119,4 @@ public class MarkupSourceViewer extends SourceViewer {
}
}
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewerConfiguration.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewerConfiguration.java
index b990a05a5..4f4e97777 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewerConfiguration.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/MarkupSourceViewerConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/ShowInTargetBridge.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/ShowInTargetBridge.java
index f02daf5f7..ee42d5bac 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/ShowInTargetBridge.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/ShowInTargetBridge.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextDocumentProvider.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextDocumentProvider.java
index 0fbc6ce5e..aa2bf4507 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextDocumentProvider.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextDocumentProvider.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourceEditor.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourceEditor.java
index 1610bfef3..90f0bb8b9 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourceEditor.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourceEditor.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009, 2013 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourcePartitioning.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourcePartitioning.java
index 175c03a15..746239375 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourcePartitioning.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/editor/WikiTextSourcePartitioning.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/AbstractTextSourceViewerConfiguration.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/AbstractTextSourceViewerConfiguration.java
index bfbf5023c..607e7e78c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/AbstractTextSourceViewerConfiguration.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/AbstractTextSourceViewerConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others .
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/DefaultHyperlinkDetectorDescriptorFilter.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/DefaultHyperlinkDetectorDescriptorFilter.java
index 9167d08eb..0e0ac41df 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/DefaultHyperlinkDetectorDescriptorFilter.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/DefaultHyperlinkDetectorDescriptorFilter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2009 David Green and others .
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
@@ -36,4 +38,4 @@ public class DefaultHyperlinkDetectorDescriptorFilter implements HyperlinkDetect
}
return false;
}
-} \ No newline at end of file
+}
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlTextPresenter.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlTextPresenter.java
index 31ce2d92b..0eb262ab3 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlTextPresenter.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlTextPresenter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewer.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewer.java
index 06d59083f..48f82e2ea 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewer.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewerConfiguration.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewerConfiguration.java
index a9e8ede5e..e58e8b240 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewerConfiguration.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/HtmlViewerConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupTextPresenter.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupTextPresenter.java
index c912feff5..50374c25a 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupTextPresenter.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupTextPresenter.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewer.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewer.java
index 100ef6ec0..d05afa788 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewer.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewer.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewerConfiguration.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewerConfiguration.java
index d4c949c0c..e94f7455c 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewerConfiguration.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/MarkupViewerConfiguration.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2009 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/Messages.java b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/Messages.java
index 735c6cb8f..7ecdefcbc 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/Messages.java
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/Messages.java
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2011 David Green and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* David Green - initial API and implementation
diff --git a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/messages.properties b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/messages.properties
index dcea071fb..5ef61131e 100644
--- a/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/messages.properties
+++ b/wikitext/ui/org.eclipse.mylyn.wikitext.ui/src/org/eclipse/mylyn/wikitext/ui/viewer/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2007, 2009 David Green and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# David Green - initial API and implementation
diff --git a/wikitext/ui/targets/wikitext.target-template b/wikitext/ui/targets/wikitext.target-template
index aa33d5857..8fdc16715 100644
--- a/wikitext/ui/targets/wikitext.target-template
+++ b/wikitext/ui/targets/wikitext.target-template
@@ -73,7 +73,7 @@
<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<unit id="org.eclipse.license.feature.group" version="2.0.0.v20180130-0820"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">

Back to the top