From e3b2b08b7664fe44daa39c44d97fbba30181afad Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 3 Feb 2020 18:14:19 +0200
Subject: [PATCH] Fix build with Java 11.

Javax.annotation has to be added as it's not part of Java 11.
Removed the classpath line from options as most of the entries there are
plain wrong and unresolvable for years - no longer inner jaras and etc.

Change-Id: I2db47f541372b3b0544996d0796071976d87cd8b
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 doc/org.eclipse.cdt.doc.isv/cdtOptions.txt | 1 -
 doc/org.eclipse.cdt.doc.isv/pom.xml        | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
index d2d88d163e2..5ef73e3c52d 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
@@ -1,7 +1,6 @@
 -charset "iso-8859-1"
 -sourcepath "../../core/org.eclipse.cdt.core.native/src;../../core/org.eclipse.cdt.core/model;../../core/org.eclipse.cdt.core/parser"
 -d reference/api
--classpath  ${bootclasspath};../org.apache.ant/lib/ant.jar;../org.eclipse.debug.core/dtcore.jar;../org.eclipse.compare/compare.jar;../org.eclipse.help/help.jar;../org.eclipse.help.ui/helpworkbench.jar;../org.eclipse.core.resources/resources.jar;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.filebuffers/filebuffers.jar;../org.eclipse.core.expressions/expressions.jar;../org.eclipse.swt.win32/ws/win32/swt.jar;../org.eclipse.swt.motif/ws/motif/swt.jar;../org.eclipse.ui/ui.jar;../org.eclipse.jdt.debug/jdi.jar;../org.eclipse.debug.ui/dtui.jar;../org.eclipse.search/search.jar;../org.eclipse.jface/jface.jar;../org.eclipse.jface.text/jfacetext.jar;../org.eclipse.text/text.jar;../org.eclipse.ui.editors/editors.jar;../org.eclipse.ui.views/views.jar;../org.eclipse.ui.workbench/workbench.jar;../org.eclipse.ui.workbench.texteditor/texteditor.jar;../org.eclipse.core.variables/variables.jar;../org.eclipse.ui.ide/ide.jar;../org.eclipse.jdt.junit/junitsupport.jar;../org.eclipse.osgi/osgi.jar;../org.eclipse.osgi/core.jar;../org.eclipse.osgi/eclipseAdaptor.jar;../org.eclipse.osgi.services/services.jar;../org.eclipse.osgi.util/util.jar
 -breakiterator
 -use
 -splitIndex
diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml
index fdbed82356c..dd32ab648b7 100644
--- a/doc/org.eclipse.cdt.doc.isv/pom.xml
+++ b/doc/org.eclipse.cdt.doc.isv/pom.xml
@@ -63,6 +63,10 @@
 									<artifactId>org.eclipse.pde.core</artifactId>
 									<type>eclipse-plugin</type>
 								</dependency>
+								<dependency>
+									<artifactId>javax.annotation</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
 							</dependencies>
 						</configuration>
 						<executions>