commit 174442ffbe40a61466a82626a9db1b11f60e7d01
author Laurent Goubet <laurent.goubet@obeo.fr> Thu Jun 18 17:00:20 2015 +0200
committer Laurent Goubet <laurent.goubet@obeo.fr> Thu Jun 18 17:03:43 2015 +0200
tree 6f6231fa612f487f8f55bc6f1047acc347eb1215
parent 8783a7f1fa0c6c4e7ff2bc1275c12b0b239bb453

restore p2-plugin, rename website zip

Change-Id: Id72fc5d91d9da0de5fc87a46a03b38c67dddc019

org.eclipse.emf.compare-parent/pom.xml

diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index 0890425..dc381fa 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -644,6 +644,22 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <defaultP2Metadata>false</defaultP2Metadata>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
       <pluginRepositories>

plugins/org.eclipse.emf.compare.doc/publisher.properties

diff --git a/plugins/org.eclipse.emf.compare.doc/publisher.properties b/plugins/org.eclipse.emf.compare.doc/publisher.properties
index 814cb2f..0771382 100644
--- a/plugins/org.eclipse.emf.compare.doc/publisher.properties
+++ b/plugins/org.eclipse.emf.compare.doc/publisher.properties
@@ -2,5 +2,5 @@
 # TODO update qualified version for each release. Please also update the pom.xml.
 DOCUMENTATION_WEBSITE__UNQUALIFIED_VERSION=3.2.0
 DOCUMENTATION_WEBSITE__QUALIFIED_VERSION=3.2.0.${buildQualifier}
-DOCUMENTATION_WEBSITE__ARTIFACT_NAME=${project.groupId}-website-3.2.0.${buildQualifier}.zip
-DOCUMENTATION_WEBSITE__ARTIFACT_URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/plugins/org.eclipse.emf.compare.doc/target/${project.artifactId}-website-3.2.0.${buildQualifier}.zip
+DOCUMENTATION_WEBSITE__ARTIFACT_NAME=${project.groupId}-website-3.2.0.${buildQualifier}
+DOCUMENTATION_WEBSITE__ARTIFACT_URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/plugins/org.eclipse.emf.compare.doc/target/${project.artifactId}-website-3.2.0.${buildQualifier}