Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2017-03-13 08:40:58 -0400
committerSteffen Pingel2017-03-13 08:40:58 -0400
commit877fe11a2fc2740db09581798a72792f620e30cf (patch)
tree5715b6a0ea2944b006a72bf284c5501d69967e7a
parent40160ba61bf83b3bd7bc4479ff27dc1c311de105 (diff)
downloadorg.eclipse.mylyn-877fe11a2fc2740db09581798a72792f620e30cf.tar.gz
org.eclipse.mylyn-877fe11a2fc2740db09581798a72792f620e30cf.tar.xz
org.eclipse.mylyn-877fe11a2fc2740db09581798a72792f620e30cf.zip
513498: consume Mylyn Docs from docs release repository
Link Mylyn Docs release artifacts through the composite site rather than including Docs on the Mylyn site. The enables decoupled release cycles for Mylyn and Mylyn Docs. Change-Id: I0067ac1205d99672303e3023170c5d3360d8b363 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=513498
-rw-r--r--org.eclipse.mylyn-downloads/snapshots/3.22/composite.index1
-rw-r--r--org.eclipse.mylyn-downloads/snapshots/oxygen/composite.index1
-rw-r--r--org.eclipse.mylyn-downloads/snapshots/weekly/composite.index1
-rw-r--r--org.eclipse.mylyn-site/pom.xml7
-rw-r--r--org.eclipse.mylyn-site/site.xml18
5 files changed, 3 insertions, 25 deletions
diff --git a/org.eclipse.mylyn-downloads/snapshots/3.22/composite.index b/org.eclipse.mylyn-downloads/snapshots/3.22/composite.index
index 0bc4e70..c8e59b8 100644
--- a/org.eclipse.mylyn-downloads/snapshots/3.22/composite.index
+++ b/org.eclipse.mylyn-downloads/snapshots/3.22/composite.index
@@ -1,2 +1,3 @@
DIRS=$(find ../../drops/3.22.*/ -mindepth 1 -maxdepth 1 -type d | sort -r | head -n 10)
+DIRS+=" ../../docs/releases/3.0"
NAME="Mylyn 3.22 Snapshots for Eclipse 4.5 and 4.6"
diff --git a/org.eclipse.mylyn-downloads/snapshots/oxygen/composite.index b/org.eclipse.mylyn-downloads/snapshots/oxygen/composite.index
index 7cb1c54..aabad2e 100644
--- a/org.eclipse.mylyn-downloads/snapshots/oxygen/composite.index
+++ b/org.eclipse.mylyn-downloads/snapshots/oxygen/composite.index
@@ -1,2 +1,3 @@
DIRS=$(find ../../drops/3.22.*/ -mindepth 1 -maxdepth 1 -type d | sort -r | head -n 10)
+DIRS+=" ../../docs/releases/3.0"
NAME="Mylyn Snapshots for Eclipse Oxygen"
diff --git a/org.eclipse.mylyn-downloads/snapshots/weekly/composite.index b/org.eclipse.mylyn-downloads/snapshots/weekly/composite.index
index 48d7bad..5c72c1e 100644
--- a/org.eclipse.mylyn-downloads/snapshots/weekly/composite.index
+++ b/org.eclipse.mylyn-downloads/snapshots/weekly/composite.index
@@ -1,2 +1,3 @@
DIRS=$(find ../../drops/3.2*/*/ -maxdepth 0 | sort -r | head -n 1)
+DIRS+=" ../../docs/releases/3.0"
NAME="Mylyn Weekly for Eclipse 4.5 and later"
diff --git a/org.eclipse.mylyn-site/pom.xml b/org.eclipse.mylyn-site/pom.xml
index 4eac3a4..8bfa062 100644
--- a/org.eclipse.mylyn-site/pom.xml
+++ b/org.eclipse.mylyn-site/pom.xml
@@ -32,13 +32,6 @@
</properties>
</profile>
</profiles>
- <repositories>
- <repository>
- <id>wikitext</id>
- <layout>p2</layout>
- <url>file:${rootDirectory}/org.eclipse.mylyn.docs/docs/org.eclipse.mylyn.docs-site/target/site/</url>
- </repository>
- </repositories>
<build>
<plugins>
<plugin>
diff --git a/org.eclipse.mylyn-site/site.xml b/org.eclipse.mylyn-site/site.xml
index a79edd6..bcdef67 100644
--- a/org.eclipse.mylyn-site/site.xml
+++ b/org.eclipse.mylyn-site/site.xml
@@ -20,12 +20,6 @@
<feature url="features/org.eclipse.mylyn.context_feature_0.0.0.jar" id="org.eclipse.mylyn.context_feature" version="0.0.0">
<category name="Features"/>
</feature>
- <feature url="features/org.eclipse.mylyn.wikitext_feature_0.0.0.jar" id="org.eclipse.mylyn.wikitext_feature" version="0.0.0">
- <category name="Features"/>
- </feature>
- <feature url="features/org.eclipse.mylyn.docs.epub_0.0.0.jar" id="org.eclipse.mylyn.docs.epub" version="0.0.0">
- <category name="Features"/>
- </feature>
<feature url="features/org.eclipse.cdt.mylyn_0.0.0.jar" id="org.eclipse.cdt.mylyn" version="0.0.0">
<category name="Integration"/>
@@ -97,15 +91,6 @@
<feature url="features/org.eclipse.mylyn.context.sdk_0.0.0.jar" id="org.eclipse.mylyn.context.sdk" version="0.0.0">
<category name="SDK"/>
</feature>
- <feature url="features/org.eclipse.mylyn.docs.epub.sdk_0.0.0.jar" id="org.eclipse.mylyn.docs.epub.sdk" version="0.0.0">
- <category name="SDK"/>
- </feature>
- <feature url="features/org.eclipse.mylyn.docs.sdk_0.0.0.jar" id="org.eclipse.mylyn.docs.sdk" version="0.0.0">
- <category name="SDK"/>
- </feature>
- <feature url="features/org.eclipse.mylyn.htmltext_0.0.0.jar" id="org.eclipse.mylyn.htmltext" version="0.0.0">
- <category name="SDK"/>
- </feature>
<feature url="features/org.eclipse.mylyn.reviews.feature_0.0.0.jar" id="org.eclipse.mylyn.reviews.feature" version="0.0.0">
<category name="SDK"/>
</feature>
@@ -127,9 +112,6 @@
<feature url="features/org.eclipse.mylyn.versions.sdk_0.0.0.jar" id="org.eclipse.mylyn.versions.sdk" version="0.0.0">
<category name="SDK"/>
</feature>
- <feature url="features/org.eclipse.mylyn.wikitext.sdk_0.0.0.jar" id="org.eclipse.mylyn.wikitext.sdk" version="0.0.0">
- <category name="SDK"/>
- </feature>
<category-def name="Features" label="Mylyn Features">
<description>

Back to the top