431100: Remove hand written source feature and let tycho autogenerate it
- assembly no longer required
- some cosmetic changes
Bug: 431100
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=431100
diff --git a/org.eclipse.epp.mpc.feature/pom.xml b/org.eclipse.epp.mpc.feature/pom.xml
index 0f84f39..d1e5e8d 100644
--- a/org.eclipse.epp.mpc.feature/pom.xml
+++ b/org.eclipse.epp.mpc.feature/pom.xml
@@ -26,6 +26,8 @@
<excludes>
<plugin id="org.eclipse.epp.mpc.help.ui"/>
</excludes>
+ <!-- Non-breakable space, as normal spaces are trimmed. -->
+ <labelSuffix> (Sources)</labelSuffix>
</configuration>
</execution>
</executions>
@@ -33,7 +35,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
<executions>
<execution>
<id>attached-p2-metadata</id>
diff --git a/org.eclipse.epp.mpc.site/assembly.xml b/org.eclipse.epp.mpc.site/assembly.xml
deleted file mode 100644
index f3f975b..0000000
--- a/org.eclipse.epp.mpc.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}/repository</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/org.eclipse.epp.mpc.site/pom.xml b/org.eclipse.epp.mpc.site/pom.xml
index 93fc79b..671c721 100644
--- a/org.eclipse.epp.mpc.site/pom.xml
+++ b/org.eclipse.epp.mpc.site/pom.xml
@@ -28,41 +28,22 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </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>
+ <phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/site</outputDirectory>
+ <outputDirectory>${project.build.directory}/repository</outputDirectory>
<resources>
<resource>
- <directory>.</directory>
+ <directory>${basedir}</directory>
<includes>
<include>index.html</include>
- <include>web/*</include>
+ <include>web/*</include>
</includes>
</resource>
</resources>
diff --git a/pom.xml b/pom.xml
index fcd442a..6c330b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,21 @@
<version>${tycho-version}</version>
</plugin>
<plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-publisher-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>