Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Barbero2017-04-13 16:11:40 -0400
committerMarkus Knauer2017-05-25 04:26:24 -0400
commit6ba464a2ab3880cb870d5c3bcd68fa4729b51294 (patch)
tree2beab3d2f9c767a4d56d8fb231eb5b9ec442797a
parentbc906afda5154632ee4c001b1e9a6774f0896739 (diff)
downloadorg.eclipse.epp.packages-6ba464a2ab3880cb870d5c3bcd68fa4729b51294.tar.gz
org.eclipse.epp.packages-6ba464a2ab3880cb870d5c3bcd68fa4729b51294.tar.xz
org.eclipse.epp.packages-6ba464a2ab3880cb870d5c3bcd68fa4729b51294.zip
Bug 515269 - Create parent pom.xml for products
It helps getting rid of "eclipse-win-sign" and "eclipse-mac-sign" <profiles> in all epp.package.xxx.product Change-Id: Ifa2ca306999cc182198e6cd1f2a62275d3cda811 Signed-off-by: Mikael Barbero <mikael@eclipse.org>
-rw-r--r--packages/org.eclipse.epp.package.android.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.committers.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.cpp.product/pom.xml110
-rw-r--r--packages/org.eclipse.epp.package.dsl.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.java.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.javascript.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.jee.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.modeling.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.parallel.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.php.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.rcp.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.reporting.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.scout.product/pom.xml111
-rw-r--r--packages/org.eclipse.epp.package.testing.product/pom.xml111
-rw-r--r--releng/org.eclipse.epp.config/parent/pom.xml21
-rw-r--r--releng/org.eclipse.epp.config/parent/product/pom.xml144
16 files changed, 197 insertions, 1521 deletions
diff --git a/packages/org.eclipse.epp.package.android.product/pom.xml b/packages/org.eclipse.epp.package.android.product/pom.xml
index 2729b0e5..dbc20a7f 100644
--- a/packages/org.eclipse.epp.package.android.product/pom.xml
+++ b/packages/org.eclipse.epp.package.android.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.android</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.committers.product/pom.xml b/packages/org.eclipse.epp.package.committers.product/pom.xml
index 34a1b2bf..7425cdbc 100644
--- a/packages/org.eclipse.epp.package.committers.product/pom.xml
+++ b/packages/org.eclipse.epp.package.committers.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.committers</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.cpp.product/pom.xml b/packages/org.eclipse.epp.package.cpp.product/pom.xml
index 14d13730..69dcfe88 100644
--- a/packages/org.eclipse.epp.package.cpp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,117 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.cpp</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.dsl.product/pom.xml b/packages/org.eclipse.epp.package.dsl.product/pom.xml
index 36564f4e..6093a6f6 100644
--- a/packages/org.eclipse.epp.package.dsl.product/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.dsl</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.java.product/pom.xml b/packages/org.eclipse.epp.package.java.product/pom.xml
index aa5e62fb..021238f9 100644
--- a/packages/org.eclipse.epp.package.java.product/pom.xml
+++ b/packages/org.eclipse.epp.package.java.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.java</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.javascript.product/pom.xml b/packages/org.eclipse.epp.package.javascript.product/pom.xml
index c5b53cac..d57fe6bb 100644
--- a/packages/org.eclipse.epp.package.javascript.product/pom.xml
+++ b/packages/org.eclipse.epp.package.javascript.product/pom.xml
@@ -8,6 +8,7 @@
Contributors:
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -17,118 +18,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.javascript</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.jee.product/pom.xml b/packages/org.eclipse.epp.package.jee.product/pom.xml
index 68d5cb49..31e5b43d 100644
--- a/packages/org.eclipse.epp.package.jee.product/pom.xml
+++ b/packages/org.eclipse.epp.package.jee.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.jee</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.modeling.product/pom.xml b/packages/org.eclipse.epp.package.modeling.product/pom.xml
index 7f5cf340..c010b46f 100644
--- a/packages/org.eclipse.epp.package.modeling.product/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.modeling</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.emf.cdo.epp*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.parallel.product/pom.xml b/packages/org.eclipse.epp.package.parallel.product/pom.xml
index b34c3cfd..c3219fe7 100644
--- a/packages/org.eclipse.epp.package.parallel.product/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.parallel</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.php.product/pom.xml b/packages/org.eclipse.epp.package.php.product/pom.xml
index 6709b66d..1335156e 100644
--- a/packages/org.eclipse.epp.package.php.product/pom.xml
+++ b/packages/org.eclipse.epp.package.php.product/pom.xml
@@ -8,6 +8,7 @@
Contributors:
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -17,118 +18,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.php</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.rcp.product/pom.xml b/packages/org.eclipse.epp.package.rcp.product/pom.xml
index 5bea1ceb..938c8b26 100644
--- a/packages/org.eclipse.epp.package.rcp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.rcp</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.reporting.product/pom.xml b/packages/org.eclipse.epp.package.reporting.product/pom.xml
index 7d376e9d..cb965ffa 100644
--- a/packages/org.eclipse.epp.package.reporting.product/pom.xml
+++ b/packages/org.eclipse.epp.package.reporting.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.reporting</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.scout.product/pom.xml b/packages/org.eclipse.epp.package.scout.product/pom.xml
index 420e58f3..a69c4f4f 100644
--- a/packages/org.eclipse.epp.package.scout.product/pom.xml
+++ b/packages/org.eclipse.epp.package.scout.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.scout</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/packages/org.eclipse.epp.package.testing.product/pom.xml b/packages/org.eclipse.epp.package.testing.product/pom.xml
index 5a96e39a..6678ba36 100644
--- a/packages/org.eclipse.epp.package.testing.product/pom.xml
+++ b/packages/org.eclipse.epp.package.testing.product/pom.xml
@@ -9,6 +9,7 @@
Contributors:
Thanh Ha (Eclipse Foundation) - initial implementation
EclipseSource - ongoing development
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -18,118 +19,12 @@
<parent>
<groupId>org.eclipse.epp</groupId>
- <artifactId>org.eclipse.epp-parent</artifactId>
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+ <relativePath>../../releng/org.eclipse.epp.config/parent/product</relativePath>
</parent>
<artifactId>epp.package.testing</artifactId>
<packaging>eclipse-repository</packaging>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- <executions>
- <execution>
- <id>mirror-to-central-epp-repository</id>
- <phase>verify</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <repository>
- <url>${project.build.directory}/repository</url>
- </repository>
- </source>
- <ius>
- <iu>
- <query>
- <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
- </query>
- </iu>
- </ius>
- <destination>${eclipse.epp.targetRepository}</destination>
- <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
- <followStrictOnly>true</followStrictOnly>
- <includeFeatures>false</includeFeatures>
- <includeOptional>false</includeOptional>
- <includeNonGreedy>false</includeNonGreedy>
- <includePacked>true</includePacked>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign-mac</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>Eclipse.app</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>eclipse-sign-windows</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
- <fileNames>
- <fileName>eclipse.exe</fileName>
- <fileName>eclipsec.exe</fileName>
- </fileNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 494812e8..fa0e4298 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -8,6 +8,7 @@
Contributors:
EclipseSource - initial implementation
+ Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -161,16 +162,6 @@
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <includeAllDependencies>true</includeAllDependencies>
- <compress>true</compress>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
@@ -241,6 +232,15 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <includeAllDependencies>true</includeAllDependencies>
+ <compress>true</compress>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
@@ -350,6 +350,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
diff --git a/releng/org.eclipse.epp.config/parent/product/pom.xml b/releng/org.eclipse.epp.config/parent/product/pom.xml
new file mode 100644
index 00000000..226b5a0c
--- /dev/null
+++ b/releng/org.eclipse.epp.config/parent/product/pom.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2017 Eclipse Foundation and others.
+ 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:
+ Mikael Barbero (Eclipse Foundation) - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.epp</groupId>
+ <artifactId>org.eclipse.epp-parent</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <name>Eclipse Packaging Project (EPP) Product parent</name>
+
+ <artifactId>org.eclipse.epp-product-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>mirror-to-central-epp-repository</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>mirror</goal>
+ </goals>
+ <configuration>
+ <source>
+ <repository>
+ <url>${project.build.directory}/repository</url>
+ </repository>
+ </source>
+ <ius>
+ <iu>
+ <query>
+ <expression>id ~= /*epp*/ &amp;&amp; !(id ~= /*org.eclipse.epp.mpc*/) &amp;&amp; !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression>
+ </query>
+ </iu>
+ </ius>
+ <destination>${eclipse.epp.targetRepository}</destination>
+ <followOnlyFilteredRequirements>true</followOnlyFilteredRequirements>
+ <followStrictOnly>true</followStrictOnly>
+ <includeFeatures>false</includeFeatures>
+ <includeOptional>false</includeOptional>
+ <includeNonGreedy>false</includeNonGreedy>
+ <includePacked>true</includePacked>
+ <append>true</append>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-director-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>eclipse-sign-mac</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-macsigner-plugin</artifactId>
+ <version>${cbi.version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
+ <fileNames>
+ <fileName>Eclipse.app</fileName>
+ </fileNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>eclipse-sign-windows</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-winsigner-plugin</artifactId>
+ <version>${cbi.version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir>
+ <fileNames>
+ <fileName>eclipse.exe</fileName>
+ <fileName>eclipsec.exe</fileName>
+ </fileNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project> \ No newline at end of file

Back to the top