diff options
| -rw-r--r-- | org.eclipse.mylyn.github-feature/feature.xml | 2 | ||||
| -rw-r--r-- | org.eclipse.mylyn.github-site/assembly.xml | 13 | ||||
| -rw-r--r-- | org.eclipse.mylyn.github-site/category.xml | 11 | ||||
| -rw-r--r-- | org.eclipse.mylyn.github-site/pom.xml | 48 | ||||
| -rw-r--r-- | org.eclipse.mylyn.github-site/site.xml | 4 |
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 cac9ad47..f70a5342 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 907a49c0..00000000 --- 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 00000000..d5f22d63 --- /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 69ad2ae9..369e3cc5 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 617b6a77..00000000 --- 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> |