Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Barbero2017-04-13 19:53:01 +0000
committerMarkus Knauer2017-05-25 08:22:42 +0000
commitbc906afda5154632ee4c001b1e9a6774f0896739 (patch)
treec1154045029711543d8a0aa214ed38346b890736 /releng/org.eclipse.epp.config/parent
parent4034f1da6cc7fca9e0ef2bdcdc5ecdaa3f8e9976 (diff)
downloadorg.eclipse.epp.packages-bc906afda5154632ee4c001b1e9a6774f0896739.tar.gz
org.eclipse.epp.packages-bc906afda5154632ee4c001b1e9a6774f0896739.tar.xz
org.eclipse.epp.packages-bc906afda5154632ee4c001b1e9a6774f0896739.zip
Bug 515269 - Define parent pom for bundles and features
Factorize <build> and <profiles> sections that only apply to eclipse-plugin and eclipse-feature packaging types. Also create an intermediate parent for bundle-parent and feature-parent to group what is common to both (e.g. jar signing). Change-Id: Ie342053cb6975f227cb631dc405b25bc03c6cba6 Signed-off-by: Mikael Barbero <mikael@eclipse.org>
Diffstat (limited to 'releng/org.eclipse.epp.config/parent')
-rw-r--r--releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml104
-rw-r--r--releng/org.eclipse.epp.config/parent/bundle/pom.xml95
-rw-r--r--releng/org.eclipse.epp.config/parent/feature/pom.xml57
-rw-r--r--releng/org.eclipse.epp.config/parent/pom.xml201
4 files changed, 313 insertions, 144 deletions
diff --git a/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml
new file mode 100644
index 00000000..4798f76c
--- /dev/null
+++ b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml
@@ -0,0 +1,104 @@
+<?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) Bundle and Feature parent</name>
+
+ <artifactId>org.eclipse.epp-bundle-feature-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <profiles>
+
+ <profile>
+ <id>eclipse-sign-jar</id>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>eclipse-cbi</id>
+ <url>https://repo.eclipse.org/content/groups/cbi/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <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>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <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>
+ <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>
+
+ </profiles>
+
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.epp.config/parent/bundle/pom.xml b/releng/org.eclipse.epp.config/parent/bundle/pom.xml
new file mode 100644
index 00000000..c8ee0438
--- /dev/null
+++ b/releng/org.eclipse.epp.config/parent/bundle/pom.xml
@@ -0,0 +1,95 @@
+<?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-bundle-feature-parent</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../bundle-feature</relativePath>
+ </parent>
+
+ <name>Eclipse Packaging Project (EPP) Bundle parent</name>
+
+ <artifactId>org.eclipse.epp-bundle-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <!--plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin-->
+ </plugins>
+ </build>
+
+ <profiles>
+
+ <profile>
+ <id>update-branding-plugins-about.mappings</id>
+ <activation>
+ <file>
+ <exists>${basedir}/about.mappings</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-about.mappings</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>about.mappings</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <configuration>
+ <additionalFileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>about.mappings</include>
+ </includes>
+ </fileSet>
+ </additionalFileSets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.epp.config/parent/feature/pom.xml b/releng/org.eclipse.epp.config/parent/feature/pom.xml
new file mode 100644
index 00000000..3271d559
--- /dev/null
+++ b/releng/org.eclipse.epp.config/parent/feature/pom.xml
@@ -0,0 +1,57 @@
+<?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-bundle-feature-parent</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../bundle-feature</relativePath>
+ </parent>
+
+ <name>Eclipse Packaging Project (EPP) Feature parent</name>
+
+ <artifactId>org.eclipse.epp-feature-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <!--plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!- Don't attach (default) metadata before the source-feature execution. ->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin-->
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 48dbf364..494812e8 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -171,20 +171,6 @@
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
@@ -262,6 +248,63 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho.version}</version>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho.extras.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho.extras.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>${cbi.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho.extras.version}</version>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
@@ -335,136 +378,6 @@
<profiles>
- <profile>
- <id>eclipse-sign-jar</id>
-
- <pluginRepositories>
- <pluginRepository>
- <id>eclipse-cbi</id>
- <url>https://repo.eclipse.org/content/groups/cbi/</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>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>${cbi.version}</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- </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>
-
- <profile>
- <id>update-branding-plugins-about.mappings</id>
- <activation>
- <file>
- <exists>${basedir}/about.mappings</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven.resources.version}</version>
- <executions>
- <execution>
- <id>process-about.mappings</id>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>about.mappings</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <additionalFileSets>
- <fileSet>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>about.mappings</include>
- </includes>
- </fileSet>
- </additionalFileSets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<!--
This profile needs to stay disabled for release builds, but may serve as a testing
facility when carrying out tests with various p2 repositories. One possible use case

Back to the top