Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-08-18 02:16:28 +0000
committerIgor Fedorenko2012-08-18 02:16:28 +0000
commit2c0d905fb262e8e1f7b886538118cba4a9e34c01 (patch)
treec9b43ba5f2a8de38b5ae7a568bfe82c7db9b3e5e
parent09a35be7a716e5f17b51955d84f587797b356027 (diff)
downloadm2e-core-2c0d905fb262e8e1f7b886538118cba4a9e34c01.tar.gz
m2e-core-2c0d905fb262e8e1f7b886538118cba4a9e34c01.tar.xz
m2e-core-2c0d905fb262e8e1f7b886538118cba4a9e34c01.zip
Introduced -Peclipse-sign to sign and pack200 on build.eclipse.org
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--m2e-maven-runtime/pom.xml76
-rw-r--r--org.eclipse.m2e.site/build.properties12
-rw-r--r--org.eclipse.m2e.site/feature.xml52
-rw-r--r--org.eclipse.m2e.site/org.eclipse.m2e.site-logback.product13
-rw-r--r--org.eclipse.m2e.site/org.eclipse.m2e.site.product12
-rw-r--r--org.eclipse.m2e.site/pom.xml53
-rw-r--r--pom.xml102
7 files changed, 183 insertions, 137 deletions
diff --git a/m2e-maven-runtime/pom.xml b/m2e-maven-runtime/pom.xml
index 1e13a8b6..4db066a9 100644
--- a/m2e-maven-runtime/pom.xml
+++ b/m2e-maven-runtime/pom.xml
@@ -34,7 +34,8 @@
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<osgi-version-qualifier>${maven.build.timestamp}</osgi-version-qualifier>
<maven-bundle-plugin.version>2.3.6</maven-bundle-plugin.version>
- <tycho.version>0.14.0</tycho.version>
+ <tycho.version>0.15.0</tycho.version>
+ <tycho-extras-version>${tycho.version}</tycho-extras-version>
</properties>
<modules>
@@ -122,6 +123,79 @@
</pluginManagement>
</build>
</profile>
+
+ <profile>
+ <id>eclipse-sign</id>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>m2e-cbi</id>
+ <url>http://download.eclipse.org/technology/m2e/maven/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>bundle</supportedProjectType>
+ </supportedProjectTypes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.0.0</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>bundle</supportedProjectType>
+ </supportedProjectTypes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>bundle</supportedProjectType>
+ </supportedProjectTypes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
diff --git a/org.eclipse.m2e.site/build.properties b/org.eclipse.m2e.site/build.properties
deleted file mode 100644
index e2fd5c1f..00000000
--- a/org.eclipse.m2e.site/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2008-2010 Sonatype, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Sonatype, Inc. - initial API and implementation
-#
-bin.includes =
-
diff --git a/org.eclipse.m2e.site/feature.xml b/org.eclipse.m2e.site/feature.xml
deleted file mode 100644
index afd3e983..00000000
--- a/org.eclipse.m2e.site/feature.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.m2e.site"
- label="m2e - Maven Integration for Eclipse Update Site"
- version="1.2.0.qualifier"
- provider-name="Eclipse.org">
-
- <includes
- id="org.eclipse.m2e.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.m2e.sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.m2e.logback.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.slf4j.api"
- download-size="0"
- install-size="0"
- version="1.6.4"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="ch.qos.logback.core"
- download-size="0"
- install-size="0"
- version="1.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="ch.qos.logback.classic"
- download-size="0"
- install-size="0"
- version="1.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="ch.qos.logback.slf4j"
- download-size="0"
- install-size="0"
- version="1.0.0"
- fragment="true"
- unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.m2e.site/org.eclipse.m2e.site-logback.product b/org.eclipse.m2e.site/org.eclipse.m2e.site-logback.product
new file mode 100644
index 00000000..402f6144
--- /dev/null
+++ b/org.eclipse.m2e.site/org.eclipse.m2e.site-logback.product
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product uid="org.eclipse.m2e.site.product" version="1.2.0.qualifier" useFeatures="false" includeLaunchers="false">
+
+ <plugins>
+ <plugin id="org.slf4j.api"/>
+ <plugin id="ch.qos.logback.core"/>
+ <plugin id="ch.qos.logback.classic" fragment="true"/>
+ <plugin id="ch.qos.logback.slf4j" fragment="true"/>
+ </plugins>
+
+</product>
diff --git a/org.eclipse.m2e.site/org.eclipse.m2e.site.product b/org.eclipse.m2e.site/org.eclipse.m2e.site.product
new file mode 100644
index 00000000..ec2f83e0
--- /dev/null
+++ b/org.eclipse.m2e.site/org.eclipse.m2e.site.product
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product uid="org.eclipse.m2e.site" version="1.2.0.qualifier" useFeatures="true" includeLaunchers="false">
+
+ <features>
+ <feature id="org.eclipse.m2e.feature" />
+ <feature id="org.eclipse.m2e.sdk.feature" />
+ <feature id="org.eclipse.m2e.logback.feature" />
+ </features>
+
+</product>
diff --git a/org.eclipse.m2e.site/pom.xml b/org.eclipse.m2e.site/pom.xml
index eebb59a0..b8d88b75 100644
--- a/org.eclipse.m2e.site/pom.xml
+++ b/org.eclipse.m2e.site/pom.xml
@@ -17,63 +17,20 @@
</parent>
<artifactId>org.eclipse.m2e.site</artifactId>
- <packaging>eclipse-feature</packaging>
+ <packaging>eclipse-repository</packaging>
<name>Maven Integration for Eclipse Update Site</name>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-7</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
<configuration>
- <deployableFeature>true</deployableFeature>
+ <includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <executions>
- <execution>
- <id>categorization</id>
- <phase>package</phase>
- <goals>
- <goal>category-p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <metadataRepositoryName>Maven Integration for Eclipse</metadataRepositoryName>
- <artifactRepositoryName>Maven Integration for Eclipse</artifactRepositoryName>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -95,7 +52,7 @@
<goal>upload-file</goal>
</goals>
<configuration>
- <file>${project.build.directory}/${project.artifactId}-${project.version}-site.zip</file>
+ <file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
<serverId>forge-releases</serverId>
<repositoryUrl>${m2e.site-compressed}</repositoryUrl>
<repositoryPath>m2e/${unqualifiedVersion}/N/${unqualifiedVersion}.${buildQualifier}</repositoryPath>
diff --git a/pom.xml b/pom.xml
index a3a6fb2f..d0f3a70d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
<m2e.site-compressed>http://repository.sonatype.org/service/local/repositories/forge-sites/content-compressed/</m2e.site-compressed>
<tycho-version>0.15.0</tycho-version>
+ <tycho-extras-version>${tycho-version}</tycho-extras-version>
<!-- eclipse version m2e is built against -->
<eclipse-repo.url>http://download.eclipse.org/releases/juno</eclipse-repo.url>
@@ -79,6 +80,16 @@
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>tycho-snapshots</id>
+ <url>https://oss.sonatype.org/content/groups/staging</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<modules>
<module>org.eclipse.m2e.model.edit</module>
@@ -193,35 +204,47 @@
</pluginManagement>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>sonatype-public</id>
- <url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<profiles>
- <!--
<profile>
- <id>sign</id>
- <activation>
- <property>
- <name>jarsigner.alias</name>
- </property>
- </activation>
+ <id>eclipse-sign</id>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>m2e-cbi</id>
+ <url>http://download.eclipse.org/technology/m2e/maven/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.0.0</version>
<executions>
<execution>
<id>sign</id>
@@ -231,10 +254,41 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>p2-metadata</id>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- -->
<!--
workaround for https://issues.sonatype.org/browse/TYCHO-562

Back to the top