diff options
| -rw-r--r-- | org.eclipse.emf.compare-parent/pom.xml | 78 | ||||
| -rw-r--r-- | packaging/org.eclipse.emf.compare.update/pom.xml | 93 |
2 files changed, 73 insertions, 98 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml index 2b25acd7f..28254c0e7 100644 --- a/org.eclipse.emf.compare-parent/pom.xml +++ b/org.eclipse.emf.compare-parent/pom.xml @@ -274,7 +274,7 @@ <profile> <id>kepler</id> <activation> - <activeByDefault>true</activeByDefault> + <activeByDefault>false</activeByDefault> </activation> <build> <plugins> @@ -287,7 +287,7 @@ <artifact> <groupId>org.eclipse.emf.compare</groupId> <artifactId>emf.compare-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <classifier>targetPlatforms/kepler-sdk</classifier> </artifact> </target> @@ -313,7 +313,7 @@ <artifact> <groupId>org.eclipse.emf.compare</groupId> <artifactId>emf.compare-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <classifier>targetPlatforms/juno-4.2-sdk</classifier> </artifact> </target> @@ -362,7 +362,7 @@ <artifact> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <classifier>target_platforms/helios-sdk</classifier> </artifact> </target> @@ -405,7 +405,7 @@ <artifact> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <classifier>target_platforms/galileo-sdk</classifier> </artifact> </target> @@ -426,6 +426,74 @@ </profile> <profile> + <id>sign</id> + <activation> + <property> + <name>BUILD_SIGN</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200a-plugin</artifactId> + <version>0.18.1</version> + <executions> + <execution> + <id>pack200-normalize</id> + <goals> + <goal>normalize</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.cbi.maven.plugins</groupId> + <artifactId>eclipse-jarsigner-plugin</artifactId> + <version>1.0.4</version> + <executions> + <execution> + <id>sign</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200b-plugin</artifactId> + <version>0.18.1</version> + <executions> + <execution> + <id>pack200-pack</id> + <goals> + <goal>pack</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + <pluginRepositories> + <pluginRepository> + <id>cbi</id> + <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + + <profile> <id>quality</id> <activation> <activeByDefault>true</activeByDefault> diff --git a/packaging/org.eclipse.emf.compare.update/pom.xml b/packaging/org.eclipse.emf.compare.update/pom.xml index c0d3c080d..8f63fa46b 100644 --- a/packaging/org.eclipse.emf.compare.update/pom.xml +++ b/packaging/org.eclipse.emf.compare.update/pom.xml @@ -86,98 +86,5 @@ version=${unqualifiedVersion}"/> </plugin> </plugins> </build> - - <profiles> - <profile> - <id>sign</id> - <activation> - <property> - <name>BUILD_SIGN</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.dash.maven</groupId> - <artifactId>eclipse-signing-maven-plugin</artifactId> - <version>1.0.5</version> - <executions> - <execution> - <!-- Pack the p2 repository. --> - <id>pack</id> - <configuration> - <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile> - </configuration> - <phase>package</phase> - <goals> - <goal>pack</goal> - </goals> - </execution> - <execution> - <!-- Sign the p2 repository --> - <id>sign</id> - <configuration> - <inputFile>${project.build.directory}/${project.artifactId}.zip</inputFile> - <signerInputDirectory>/home/data/httpd/download-staging.priv/emf/compare</signerInputDirectory> - </configuration> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - <execution> - <!-- Repack the p2 repository --> - <id>repack</id> - <configuration> - <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile> - </configuration> - <phase>package</phase> - <goals> - <goal>pack</goal> - </goals> - </execution> - <execution> - <!-- Signing and packing alters checksums so fix them --> - <id>fixCheckSums</id> - <phase>package</phase> - <goals> - <goal>fixCheckSums</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>replace-unsigned-repository-by-signed-one</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <!-- prepare zip repo and repo for archiving --> - <move file="${project.build.directory}/repository" tofile="${project.build.directory}/repository-not-signed"/> - <move file="${project.build.directory}/checksumFix" tofile="${project.build.directory}/repository"/> - <move file="${project.build.directory}/${project.artifactId}.zip" tofile="${project.build.directory}/${project.artifactId}-not-signed.zip"/> - <zip destfile="${project.build.directory}/${project.artifactId}.zip" basedir="${project.build.directory}/repository"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <pluginRepositories> - <pluginRepository> - <id>maven.eclipse.org</id> - <url>http://maven.eclipse.org/nexus/content/groups/public/</url> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> </project> |