summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMatthias Sohn2013-05-16 11:24:53 (EDT)
committer Szymon Brandys2013-05-21 03:53:18 (EDT)
commit8c765abc93298926bde88456595fee2c89ef5573 (patch)
tree1d7903aeb11390739d0effeb75454faa69c27ef8
parente8622a168d13a96dcd75ddaadd2175dbeab9c6c6 (diff)
downloadorg.eclipse.orion.client-8c765abc93298926bde88456595fee2c89ef5573.zip
org.eclipse.orion.client-8c765abc93298926bde88456595fee2c89ef5573.tar.gz
org.eclipse.orion.client-8c765abc93298926bde88456595fee2c89ef5573.tar.bz2
Bug 399023 - Add a p2 repository for assembling client bundles
This is required to consume the result of the orion client build from the orion server build which runs in a different Hudson job since Tycho can only consume bundles from another build via a p2 repository. Assembling bundles directly into a p2 repository requires that we update to use Tycho 0.17. Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--pom.xml6
-rw-r--r--releng/org.eclipse.orion.client.repository/.project11
-rw-r--r--releng/org.eclipse.orion.client.repository/category.xml19
-rw-r--r--releng/org.eclipse.orion.client.repository/pom.xml60
4 files changed, 94 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index f91bfed..c15b3ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,8 @@
<properties>
<orion-version>1.0.0-SNAPSHOT</orion-version>
- <tycho-version>0.16.0</tycho-version>
- <tycho-extras-version>0.16.0</tycho-extras-version>
+ <tycho-version>0.17.0</tycho-version>
+ <tycho-extras-version>0.17.0</tycho-extras-version>
<tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git</tycho.scmUrl>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-version>1.6</java-version>
@@ -82,6 +82,8 @@
<module>bundles/org.eclipse.orion.client.git</module>
<module>bundles/org.eclipse.orion.client.ui</module>
<module>bundles/org.eclipse.orion.client.users</module>
+
+ <module>releng/org.eclipse.orion.client.repository</module>
</modules>
<build>
diff --git a/releng/org.eclipse.orion.client.repository/.project b/releng/org.eclipse.orion.client.repository/.project
new file mode 100644
index 0000000..778cf26
--- /dev/null
+++ b/releng/org.eclipse.orion.client.repository/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.orion.client.repository</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.orion.client.repository/category.xml b/releng/org.eclipse.orion.client.repository/category.xml
new file mode 100644
index 0000000..81c49dd
--- /dev/null
+++ b/releng/org.eclipse.orion.client.repository/category.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <bundle id="org.eclipse.orion.client.core" version="2.0.0.qualifier">
+ <category name="org.eclipse.orion.client"/>
+ </bundle>
+ <bundle id="org.eclipse.orion.client.editor" version="1.0.0.qualifier">
+ <category name="org.eclipse.orion.client"/>
+ </bundle>
+ <bundle id="org.eclipse.orion.client.git" version="1.0.0.qualifier">
+ <category name="org.eclipse.orion.client"/>
+ </bundle>
+ <bundle id="org.eclipse.orion.client.ui" version="2.0.0.qualifier">
+ <category name="org.eclipse.orion.client"/>
+ </bundle>
+ <bundle id="org.eclipse.orion.client.users" version="1.0.0.qualifier">
+ <category name="org.eclipse.orion.client"/>
+ </bundle>
+ <category-def name="org.eclipse.orion.client" label="Orion Client"/>
+</site>
diff --git a/releng/org.eclipse.orion.client.repository/pom.xml b/releng/org.eclipse.orion.client.repository/pom.xml
new file mode 100644
index 0000000..21fd806
--- /dev/null
+++ b/releng/org.eclipse.orion.client.repository/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2013, SAP AG 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
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Matthias Sohn - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.eclipse.orion</groupId>
+ <artifactId>org.eclipse.orion.client.repository</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+
+ <parent>
+ <groupId>org.eclipse.orion</groupId>
+ <artifactId>org.eclipse.orion.client.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includeAllDependencies>true</includeAllDependencies>
+ <createArtifactRepository>true</createArtifactRepository>
+ <compress>true</compress>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-publisher-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <publishArtifacts>true</publishArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>