Merge "Retrieve wikitext jars via OSGi dependencies and maven"

6 files changed, 15 insertions, 5 deletions

diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
index 611f690e11..46cd1503ae 100644
--- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
@@ -6,3 +6,5 @@ Bundle-Version: 0.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
+Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="[1.3.0,2.0.0)"
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index e472488dca..4ea8be165f 100644
--- a/org.eclipse.egit.doc/build-help.xml
+++ b/org.eclipse.egit.doc/build-help.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><!--
     Copyright (c) 2010 Chris Aniszczyk and others.
+    Copyright (c) 2010 Matthias Sohn <matthias.sohn@sap.com>
     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
@@ -7,6 +8,7 @@
 
     Contributors:
          Chris Aniszczyk - initial API and implementation
+         Matthias Sohn - maven integration
  -->
 
 <project name="org.eclipse.egit.doc" default="all">
@@ -20,10 +22,9 @@
 	<property name="tmpFolder" value="target/tmp"/>
 
 	<path id="wikitext.tasks.classpath">
-		<fileset dir="lib">
-			<include name="org.eclipse.mylyn.wikitext.*core*.jar"/>
-		</fileset>
+		<pathelement path="${compile_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"/>
diff --git a/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.core_1.3.0.I20100116-0000-e3x.jar b/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.core_1.3.0.I20100116-0000-e3x.jar
deleted file mode 100644
index f3972facc6..0000000000
--- a/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.core_1.3.0.I20100116-0000-e3x.jar
+++ /dev/null
diff --git a/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.3.0.I20100116-0000-e3x.jar b/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.3.0.I20100116-0000-e3x.jar
deleted file mode 100644
index 3b44b0b3bc..0000000000
--- a/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.3.0.I20100116-0000-e3x.jar
+++ /dev/null
diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml
index d01c83f75b..297bc3a4d2 100644
--- a/org.eclipse.egit.doc/pom.xml
+++ b/org.eclipse.egit.doc/pom.xml
@@ -39,8 +39,9 @@
           <execution>
             <phase>generate-sources</phase>
             <configuration>
-	      <tasks if="update.egit.doc">
-                <property name="runtime-classpath" refid="maven.runtime.classpath"/>
+                <tasks if="update.egit.doc">
+                <id>update-documentation</id>
+                <property name="compile_classpath" refid="maven.compile.classpath"/>
                 <ant target="all" inheritRefs="true" antfile="build-help.xml"/>
               </tasks>
             </configuration>
diff --git a/pom.xml b/pom.xml
index f3033c2b6a..b205838158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
     <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/target/site</jgit-site>
     <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
     <swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site>
+    <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly/e3.4</wikitext-site>
   </properties>
 
   <profiles>
@@ -135,6 +136,11 @@
       <layout>p2</layout>
       <url>${swtbot-site}</url>
     </repository>
+    <repository>
+      <id>wikitext</id>
+      <layout>p2</layout>
+      <url>${wikitext-site}</url>
+    </repository>
   </repositories>
 
   <build>