Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-09-25 05:56:50 -0400
committerlgoubet2019-09-25 05:56:50 -0400
commit51941ba55225bf9a877ccb830208d8c01fbd44e6 (patch)
treed4460d9d92b96b65eb85124180b785f0d8a9656d
parent5235efc9323c45431120dc110cbb24cd0c855a9e (diff)
downloadorg.eclipse.emf.compare-51941ba55225bf9a877ccb830208d8c01fbd44e6.tar.gz
org.eclipse.emf.compare-51941ba55225bf9a877ccb830208d8c01fbd44e6.tar.xz
org.eclipse.emf.compare-51941ba55225bf9a877ccb830208d8c01fbd44e6.zip
Re-enable signing and tycho-p2-plugin, switch website to antrun3.3.9M2
See bug 551450. The wrong zip file ends up being used as the build artifact for the documentation plugin when using maven-assembly-plugin. Using maven-antrun plugin instead allows us to workaround the issue and have EMF Compare's doc plugin be signed correctly. Change-Id: Ib6656920ea2b5fea6be03b338d61a8ad0abebbca
-rw-r--r--org.eclipse.emf.compare-parent/pom.xml16
-rw-r--r--plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.doc/assembly.xml20
-rw-r--r--plugins/org.eclipse.emf.compare.doc/pom.xml22
-rw-r--r--plugins/org.eclipse.emf.compare.doc/publisher.properties6
5 files changed, 28 insertions, 38 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index e2c5d435e..b344279ba 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -583,6 +583,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>
diff --git a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
index 7f1b70c3e..b8067e12b 100644
--- a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.doc; singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.9.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.compare.doc/assembly.xml b/plugins/org.eclipse.emf.compare.doc/assembly.xml
deleted file mode 100644
index be328f18c..000000000
--- a/plugins/org.eclipse.emf.compare.doc/assembly.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<assembly>
- <id>website</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>false</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/website</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.compare.doc/pom.xml b/plugins/org.eclipse.emf.compare.doc/pom.xml
index 96aa3d3aa..a0a150241 100644
--- a/plugins/org.eclipse.emf.compare.doc/pom.xml
+++ b/plugins/org.eclipse.emf.compare.doc/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.doc</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.9-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
@@ -120,8 +120,8 @@
<argument>-website</argument>
<argument>${project.build.directory}/website</argument>
<argument>-version</argument>
- <!-- Please update qualified version for each release. Please also update the publisher.properties.-->
- <argument>3.3.0.${buildQualifier}</argument>
+ <!-- Please update qualified version for each release.-->
+ <argument>3.3.9.${buildQualifier}</argument>
</arguments>
</configuration>
</execution>
@@ -129,22 +129,22 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>run</goal>
</goals>
</execution>
</executions>
<configuration>
- <!-- Please update qualified version for each release. Please also update the publisher.properties.-->
- <finalName>${project.artifactId}-website-3.3.0.${buildQualifier}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
+ <target>
+ <!-- Please update qualified version for each release.-->
+ <zip destfile="${project.build.directory}/${project.artifactId}-website-3.3.9.${buildQualifier}.zip">
+ <zipfileset dir="${project.build.directory}/website"/>
+ </zip>
+ </target>
</configuration>
</plugin>
</plugins>
diff --git a/plugins/org.eclipse.emf.compare.doc/publisher.properties b/plugins/org.eclipse.emf.compare.doc/publisher.properties
deleted file mode 100644
index 7b3ec579c..000000000
--- a/plugins/org.eclipse.emf.compare.doc/publisher.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# EMFCompare publisher properties
-# TODO update qualified version for each release. Please also update the pom.xml.
-DOCUMENTATION_WEBSITE__UNQUALIFIED_VERSION=3.3.0
-DOCUMENTATION_WEBSITE__QUALIFIED_VERSION=3.3.0.${buildQualifier}
-DOCUMENTATION_WEBSITE__ARTIFACT_NAME=${project.groupId}-website-3.3.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.3.0.${buildQualifier}.zip

Back to the top