summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Steeg2011-03-25 15:09:43 (EDT)
committer Chris Aniszczyk2011-03-30 17:12:16 (EDT)
commit487cea9a8c23d97c01d1e8c7b30ebf44346ad174 (patch)
tree6b30ae1db2c3b30ef6afefa7f76c3bf1fc1f09ba
parentce72947bb045eb484d6c08b8cd77202ff2d14641 (diff)
downloadegit-github-487cea9a8c23d97c01d1e8c7b30ebf44346ad174.zip
egit-github-487cea9a8c23d97c01d1e8c7b30ebf44346ad174.tar.gz
egit-github-487cea9a8c23d97c01d1e8c7b30ebf44346ad174.tar.bz2
Build 'eclipse-repository' instead of 'eclipse-update-site'refs/changes/30/2930/5
Change-Id: I165026955642cc9d4274a4ff6af675f2f8e4a896 Signed-off-by: Fabian Steeg <fsteeg@gmail.com> Signed-off-by: Mykola Nikishov <mn@mn.com.ua> Signed-off-by: Chris Aniszczyk <caniszczyK@gmail.com>
-rw-r--r--org.eclipse.mylyn.github-feature/feature.xml2
-rw-r--r--org.eclipse.mylyn.github-site/assembly.xml13
-rw-r--r--org.eclipse.mylyn.github-site/category.xml11
-rw-r--r--org.eclipse.mylyn.github-site/pom.xml48
-rw-r--r--org.eclipse.mylyn.github-site/site.xml4
5 files changed, 18 insertions, 60 deletions
diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml
index cac9ad4..f70a534 100644
--- a/org.eclipse.mylyn.github-feature/feature.xml
+++ b/org.eclipse.mylyn.github-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.mylyn.github.feature"
- label="Eclipse EGit Mylyn GitHub Feature"
+ label="Eclipse EGit Mylyn GitHub Feature (Incubation)"
version="0.1.0.qualifier"
provider-name="Eclipse EGit">
diff --git a/org.eclipse.mylyn.github-site/assembly.xml b/org.eclipse.mylyn.github-site/assembly.xml
deleted file mode 100644
index 907a49c..0000000
--- a/org.eclipse.mylyn.github-site/assembly.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<assembly>
- <id>site</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/site</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/org.eclipse.mylyn.github-site/category.xml b/org.eclipse.mylyn.github-site/category.xml
new file mode 100644
index 0000000..d5f22d6
--- /dev/null
+++ b/org.eclipse.mylyn.github-site/category.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.mylyn.github.feature_0.1.0.qualifier.jar" id="org.eclipse.mylyn.github.feature" version="0.1.0.qualifier">
+ <category name="Collaboration"/>
+ </feature>
+ <category-def name="Collaboration" label="Collaboration">
+ <description>
+ Tools to foster collaboration between developers.
+ </description>
+ </category-def>
+</site>
diff --git a/org.eclipse.mylyn.github-site/pom.xml b/org.eclipse.mylyn.github-site/pom.xml
index 69ad2ae..369e3cc 100644
--- a/org.eclipse.mylyn.github-site/pom.xml
+++ b/org.eclipse.mylyn.github-site/pom.xml
@@ -18,56 +18,20 @@
<version>0.1.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.mylyn.github-updatesite</artifactId>
- <packaging>eclipse-update-site</packaging>
+ <artifactId>github-updatesite</artifactId>
+ <packaging>eclipse-repository</packaging>
<name>Eclipse EGit Mylyn GitHub Repository (Incubation)</name>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>tycho-p2-publisher-plugin</artifactId>
+ <version>${tycho-version}</version>
<configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
+ <publishArtifacts>true</publishArtifacts>
</configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/site</outputDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>index.html</include>
- <include>web/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/org.eclipse.mylyn.github-site/site.xml b/org.eclipse.mylyn.github-site/site.xml
deleted file mode 100644
index 617b6a7..0000000
--- a/org.eclipse.mylyn.github-site/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.eclipse.mylyn.github.feature_0.0.0.qualifier.jar" id="org.eclipse.mylyn.github.feature" version="0.0.0"/>
-</site>