diff options
Diffstat (limited to 'releng/main/pom.xml')
| -rwxr-xr-x | releng/main/pom.xml | 132 |
1 files changed, 31 insertions, 101 deletions
diff --git a/releng/main/pom.xml b/releng/main/pom.xml index 052e699705a..972c982fb90 100755 --- a/releng/main/pom.xml +++ b/releng/main/pom.xml @@ -9,15 +9,15 @@ <version>0.0.1-SNAPSHOT</version> </parent> - <artifactId>org.eclipse.papyrus.releng</artifactId> + <artifactId>org.eclipse.papyrus.main.releng</artifactId> <packaging>pom</packaging> <properties> <!-- https://repo.maven.apache.org/maven2/ --> - <mojo.buildhelper.version>3.2.0</mojo.buildhelper.version> - <mylyn.wikitext.version>3.0.38</mylyn.wikitext.version> + <mojo.buildhelper.version>3.4.0</mojo.buildhelper.version> + <mylyn.wikitext.version>3.0.42</mylyn.wikitext.version> - <target.platform>org.eclipse.papyrus.main.${target.suffix}.target</target.platform> + <target.platform>org.eclipse.papyrus.main.targetplatform</target.platform> </properties> <modules> @@ -33,6 +33,24 @@ <!-- redistributed plugins --> <plugins> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + <configuration> + <defaultP2Metadata>false</defaultP2Metadata> + </configuration> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>${mojo.buildhelper.version}</version> @@ -79,25 +97,11 @@ </pluginManagement> <plugins> - <!-- Test local parameters - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <echoproperties /> - </target> - </configuration> - </execution> - </executions> - </plugin--> + <!-- Test local parameters <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> <version>3.0.0</version> <executions> + <execution> <phase>validate</phase> <goals> <goal>run</goal> </goals> <configuration> + <target> <echoproperties /> </target> </configuration> </execution> </executions> + </plugin --> <!-- local plugins --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -128,18 +132,10 @@ <goal>plugin-source</goal> </goals> </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tychoExtrasVersion}</version> - <executions> <execution> - <id>source-feature</id> - <phase>package</phase> + <id>feature-source</id> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> </execution> </executions> @@ -170,30 +166,6 @@ only. Activation: SIGN=true pack: produce a simple update site (Packed). Used for nightly or feature branch builds. Activation: SIGN=false --> <profiles> - <profile> - <id>defaultProfile</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attach-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <!-- The update site is not needed during gerrit jobs --> <profile> @@ -270,33 +242,18 @@ <!-- Stable release profile. Takes +30min. Eclipse servers only --> <profile> - <id>packAndSign</id> + <id>sign</id> <activation> <property> <name>SIGN</name> <value>true</value> </property> </activation> - <!-- Pack200 --> <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tychoExtrasVersion}</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>${jarSignerVersion}</version> <executions> <execution> <id>sign</id> @@ -307,19 +264,6 @@ </executions> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tychoExtrasVersion}</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> @@ -343,7 +287,7 @@ <!-- Nightly profile. Artifacts can be consumed, but are not signed --> <profile> - <id>pack</id> + <id>p2</id> <activation> <property> <name>SIGN</name> @@ -352,20 +296,6 @@ </activation> <build> <plugins> - <!-- Pack200 --> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tychoExtrasVersion}</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> |