doc: Add explicit dependency on mylyn.wikitext.core.ant

With recent versions of Mylyn Wikitext, it seems the
"org.eclipse.mylyn.wikitext.core.ant" bundle (which contains the Ant
task definitions) is not depended on by
"org.eclipse.mylyn.wikitext.core" anymore, so it does not end up
on Maven's compile classpath, and is not available for the Ant scripts.

Rectify this by adding an explicit dependency to it in the doc/ plugins.

Note that this is a compile-time dependency only, not a runtime one,
so we specify it in the build.properties file.

This should fix a current build failure with the staging target.

Change-Id: I358da1ed51754c3b355cb5e7f9a2d92e0e65f2a6
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/66773
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/doc/org.eclipse.tracecompass.doc.dev/build.properties b/doc/org.eclipse.tracecompass.doc.dev/build.properties
index 88b2770fa5b485a9f30c7b552d2c2578b8b2c41e..36adb1b0732d8c554dc6d489c2030fd204de88ee 100644 (file)
--- a/doc/org.eclipse.tracecompass.doc.dev/build.properties
+++ b/doc/org.eclipse.tracecompass.doc.dev/build.properties
@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\
                doc/,\
                index/
 jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
+                       platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
                        platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
 src.includes = about.html
 

diff --git a/doc/org.eclipse.tracecompass.doc.user/build.properties b/doc/org.eclipse.tracecompass.doc.user/build.properties
index 11b4b343f455aef4e72772697a9ea703439a8600..8225cb0aa5b0cf61fb7992aa320b23aa9e4d68f8 100644 (file)
--- a/doc/org.eclipse.tracecompass.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.doc.user/build.properties
@@ -19,5 +19,6 @@ bin.includes = plugin.xml,\
                reference/,\
                index/
 jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
+                       platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
                        platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
 src.includes = about.html

diff --git a/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.properties b/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.properties
index 68490c53882e5fcd863800c773fe43f35232071e..9e3ed5749745926e2604628bef890f12deed90d6 100644 (file)
--- a/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.gdbtrace.doc.user/build.properties
@@ -18,5 +18,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                index/
 jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
+                       platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
                        platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
 src.includes = about.html

diff --git a/doc/org.eclipse.tracecompass.rcp.doc.user/build.properties b/doc/org.eclipse.tracecompass.rcp.doc.user/build.properties
index 37997aec9016696fcc9d746cb4aadf3ac5d6bef1..2698165e20f3539835539f64eba6c25a4ac3d857 100644 (file)
--- a/doc/org.eclipse.tracecompass.rcp.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.rcp.doc.user/build.properties
@@ -18,5 +18,6 @@ bin.includes = plugin.xml,\
                doc/,\
                index/
 jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
+                       platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
                        platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
 src.includes = about.html

diff --git a/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.properties b/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.properties
index 2ba79cb767d239105bd0e91f54bbd63c70ed966a..92afd57221868a7324f11da5e7743cee184e44b2 100644 (file)
--- a/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.properties
+++ b/doc/org.eclipse.tracecompass.tmf.pcap.doc.user/build.properties
@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\
                doc/,\
                index/
 jars.extra.classpath = platform:/plugin/org.eclipse.mylyn.wikitext.core,\
+                       platform:/plugin/org.eclipse.mylyn.wikitext.core.ant,\
                        platform:/plugin/org.eclipse.mylyn.wikitext.mediawiki.core
 src.includes = about.html