508880: [Fix] Use implicit dependencies to avoid forcing the
installation of specific plugins
Add additional repositories for installation of required plugins (emf,
plantuml). Also generates HTML content for update site.
Change-Id: I515e5700dd85b58c83571c92d82ad3b7cdb61e55
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=508880
diff --git a/org.eclipse.capra.releng.p2/pom.xml b/org.eclipse.capra.releng.p2/pom.xml
index efb2469..47709d2 100644
--- a/org.eclipse.capra.releng.p2/pom.xml
+++ b/org.eclipse.capra.releng.p2/pom.xml
@@ -14,6 +14,21 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<name>Capra update site</name>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </pluginRepository>
+
+ <pluginRepository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -21,6 +36,41 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
+
+ <!-- Generate HTML version of update site -->
+ <!-- Also add additional repositories. Note that this
+ information could be entered in category.xml but Tycho
+ ignores it currently. See
+ https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
+ <plugin>
+ <groupId>org.jboss.tools.tycho-plugins</groupId>
+ <artifactId>repository-utils</artifactId>
+ <version>${org.jboss.tools.tycho-plugins.version}</version>
+
+ <executions>
+ <execution>
+ <id>generate-facade</id>
+ <phase>package</phase>
+
+ <goals>
+ <goal>generate-repository-facade</goal>
+ </goals>
+
+ <configuration>
+ <siteTemplateFolder>siteTemplate</siteTemplateFolder>
+
+ <symbols>
+ <update.site.name>${project.parent.name}</update.site.name>
+ </symbols>
+
+ <associateSites>
+ <site>http://download.eclipse.org/releases/neon</site>
+ <site>http://basar.idi.ntnu.no/svn/tdt4100/anonymous/trunk/updatesite</site>
+ </associateSites>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/org.eclipse.capra.releng.p2/siteTemplate/index.html b/org.eclipse.capra.releng.p2/siteTemplate/index.html
new file mode 100644
index 0000000..37b7456
--- /dev/null
+++ b/org.eclipse.capra.releng.p2/siteTemplate/index.html
@@ -0,0 +1,25 @@
+<html>
+ <head>
+ <title>${update.site.name} Update Site</title>
+ </head>
+
+ <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+
+ <h2 class="title">${update.site.name} - Use this URL in Eclipse to install ${update.site.name}</h2>
+
+ <p>This is the Update Site for ${update.site.name}.
+ <ol>
+ <li>To install ${update.site.name} from this site, start up Eclipse, then do:
+ <ul><code><strong>Help > Install New Software... ></strong></code></ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install, or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+ <li>Click <code><strong>Next</strong></code>, agree to the license terms, and install.</li>
+ </ol>
+ </p>
+
+ <p>${site.contents}</p>
+ </body>
+</html>
diff --git a/pom.xml b/pom.xml
index e1b3511..c5c7689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
<artifactId>parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>Capra</name>
<modules>
<module>org.eclipse.capra.core</module>
@@ -55,6 +56,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho-version>0.24.0</tycho-version>
+ <org.jboss.tools.tycho-plugins.version>0.23.2</org.jboss.tools.tycho-plugins.version>
</properties>
<profiles>
