diff options
author | Mat Booth | 2017-07-05 15:17:29 +0000 |
---|---|---|
committer | Mat Booth | 2017-07-05 15:34:38 +0000 |
commit | 3b704e5c6fd32cd0985571b4c7e1188e81dc2c21 (patch) | |
tree | 31f98b03bdb584804504377194522ba7abe09431 | |
parent | 63921de27e9730db95498f021dc6f9bb76037b32 (diff) | |
download | egit-github-3b704e5c6fd32cd0985571b4c7e1188e81dc2c21.tar.gz egit-github-3b704e5c6fd32cd0985571b4c7e1188e81dc2c21.tar.xz egit-github-3b704e5c6fd32cd0985571b4c7e1188e81dc2c21.zip |
Doc bundle has unnecessary runtime dep on wikitext
We don't actually benefit from having wikitext present at runtime, so
drop the require-bundle directives and instead pull wikitext in as a
purely build-time dependency of the antrun plugin.
Bug: 519248
Change-Id: Ia16c115091505dda1f2e1584a292f9bacac97bf8
Signed-off-by: Mat Booth <mat.booth@redhat.com>
5 files changed, 24 insertions, 17 deletions
diff --git a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF index 74e5ff0c..599e6ea8 100755 --- a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF @@ -5,5 +5,3 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.doc;singleton:=true Bundle-Version: 4.9.0.qualifier Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional, - org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional diff --git a/org.eclipse.mylyn.github.doc/build-help.xml b/org.eclipse.mylyn.github.doc/build-help.xml index dfcecc5c..5be23054 100755 --- a/org.eclipse.mylyn.github.doc/build-help.xml +++ b/org.eclipse.mylyn.github.doc/build-help.xml @@ -16,11 +16,10 @@ </description> <path id="wikitext.tasks.classpath"> - <pathelement path="${compile_classpath}"/> + <pathelement path="${plugin_classpath}"/> </path> - <echo message="compile classpath: ${compile_classpath}"/> - <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/tasks.properties"/> - <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties"/> + <echo message="wikitext classpath: ${plugin_classpath}"/> + <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/mediawiki/ant/tasks.properties"/> <property name="help.doc.url.base" value="http://wiki.eclipse.org" /> diff --git a/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/Updating-This-Document.html b/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/Updating-This-Document.html index 90842e70..8e579725 100644 --- a/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/Updating-This-Document.html +++ b/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/Updating-This-Document.html @@ -24,13 +24,13 @@ <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top"></td> </tr> - </table><hr/> + </table><hr class="navigation-separator"/> <h1 id="Updating_This_Document">Updating This Document</h1> <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit <a href="http://wiki.eclipse.org/EGit/GitHub/User_Guide" target="egit_github_external">http://wiki.eclipse.org/EGit/GitHub/User_Guide</a> - </p><hr/> + </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> diff --git a/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/User-Guide.html b/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/User-Guide.html index 6eef8bf5..8a7308bd 100644 --- a/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/User-Guide.html +++ b/org.eclipse.mylyn.github.doc/help/EGit/GitHub/User_Guide/User-Guide.html @@ -24,7 +24,7 @@ <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> - </table><hr/> + </table><hr class="navigation-separator"/> <h2 id="Overview">Overview</h2> <p>The EGit Mylyn GitHub connector supports creating task repositories for working with <a href="http://www.github.com" target="egit_github_external">GitHub</a> issues and @@ -136,7 +136,7 @@ </li> </ul> </li> - </ul><hr/> + </ul><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"></td> diff --git a/org.eclipse.mylyn.github.doc/pom.xml b/org.eclipse.mylyn.github.doc/pom.xml index e4f2d328..fcddfe37 100755 --- a/org.eclipse.mylyn.github.doc/pom.xml +++ b/org.eclipse.mylyn.github.doc/pom.xml @@ -30,19 +30,29 @@ http://www.eclipse.org/legal/epl-v10.html <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>optional</artifactId> - <version>1.5.4</version> - </dependency> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>optional</artifactId> + <version>1.5.4</version> + </dependency> + <dependency> + <groupId>org.eclipse.mylyn.docs</groupId> + <artifactId>org.eclipse.mylyn.wikitext.ant</artifactId> + <version>3.0.9</version> + </dependency> + <dependency> + <groupId>org.eclipse.mylyn.docs</groupId> + <artifactId>org.eclipse.mylyn.wikitext.mediawiki.ant</artifactId> + <version>3.0.9</version> + </dependency> </dependencies> <executions> <execution> <phase>generate-sources</phase> <configuration> <tasks if="update.doc"> - <property name="compile_classpath" refid="maven.compile.classpath"/> + <property name="plugin_classpath" refid="maven.plugin.classpath"/> <ant target="all" inheritRefs="true" antfile="build-help.xml"/> </tasks> </configuration> |