aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2018-06-15 11:36:15 -0400
committerMat Booth2018-06-15 11:36:15 -0400
commitec639ea4665a7611d7af4b4dacab0b0203742108 (patch)
tree61589bf0db08a1284d56c4bd39f0a6d192890fd3
parentaf4d1e0abb386c0c5459601e4df2f74bdf37efb1 (diff)
downloadorg.eclipse.pdt-ec639ea4665a7611d7af4b4dacab0b0203742108.tar.gz
org.eclipse.pdt-ec639ea4665a7611d7af4b4dacab0b0203742108.tar.xz
org.eclipse.pdt-ec639ea4665a7611d7af4b4dacab0b0203742108.zip
Bug 535955 - Use latest wikitext for generating docs
Change to the updated maven coords and package names for wikitext 3. Change-Id: I9277924eb681e26eacc7dcda1937cf292f8bc666 Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--plugins/org.eclipse.php.help/docs/build/build.xml4
-rw-r--r--plugins/org.eclipse.php.help/docs/build/compile.js4
-rw-r--r--plugins/org.eclipse.php.help/pom.xml21
3 files changed, 7 insertions, 22 deletions
diff --git a/plugins/org.eclipse.php.help/docs/build/build.xml b/plugins/org.eclipse.php.help/docs/build/build.xml
index faed709de..dfc466348 100644
--- a/plugins/org.eclipse.php.help/docs/build/build.xml
+++ b/plugins/org.eclipse.php.help/docs/build/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2014 Dawid Pakuła and others.
+ Copyright (c) 2014, 2018 Dawid Pakuła 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
@@ -13,7 +13,7 @@
<path id="wikitext.classpath">
<pathelement path="${compile_classpath}" />
</path>
- <taskdef classpathref="wikitext.classpath" resource="org/eclipse/mylyn/wikitext/core/ant/tasks.properties" />
+ <taskdef classpathref="wikitext.classpath" resource="org/eclipse/mylyn/wikitext/ant/tasks.properties" />
<property name="help.base.dir" value="${basedir}" />
<property name="doc.source.dir" value="${basedir}/docs/source" />
<property name="doc.template.dir" value="${basedir}/docs/template" />
diff --git a/plugins/org.eclipse.php.help/docs/build/compile.js b/plugins/org.eclipse.php.help/docs/build/compile.js
index 25987ec3a..1641dad56 100644
--- a/plugins/org.eclipse.php.help/docs/build/compile.js
+++ b/plugins/org.eclipse.php.help/docs/build/compile.js
@@ -144,7 +144,7 @@ with (javaImporter) {
task.setOverwrite(true);
task.setXhtmlStrict(true);
task.setValidate(false);
- var style = new org.eclipse.mylyn.internal.wikitext.core.ant.MarkupToHtmlTask.Stylesheet();
+ var style = new org.eclipse.mylyn.wikitext.ant.internal.MarkupToHtmlTask.Stylesheet();
var pre = '';
for (var m = 0; m < tree.url.split('/').length - 1; m++) {
pre += '../';
@@ -370,4 +370,4 @@ with (javaImporter) {
echo.setFile(new File(project.getProperty('help.toc')));
echo.perform();
-} \ No newline at end of file
+}
diff --git a/plugins/org.eclipse.php.help/pom.xml b/plugins/org.eclipse.php.help/pom.xml
index bbd308547..6acc8d07b 100644
--- a/plugins/org.eclipse.php.help/pom.xml
+++ b/plugins/org.eclipse.php.help/pom.xml
@@ -59,35 +59,20 @@
</executions>
<dependencies>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core</artifactId>
- <version>LATEST</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.ant</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.markdown.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.ant</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.help.sdk</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.markdown</artifactId>
<version>LATEST</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>15.0</version>
- </dependency>
</dependencies>
</plugin>
<plugin>