mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

Upgrade to Tycho 0.21.0

Browse source 
Change-Id: I1ef13eda4f297c10ee360cac64f43d58a91790e1
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/29954
Tested-by: Hudson CI
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>
This commit is contained in:
Marc-Andre Laperle 2014-07-15 21:37:25 -04:00
parent f17501b981
commit 86a08c918e
7 changed files with 103 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
View file

@ -38,18 +38,26 @@
<include>**/AllManagedBuildTests.*</include> <include>**/AllManagedBuildTests.*</include>
</includes> </includes>
<testFailureIgnore>true</testFailureIgnore> <testFailureIgnore>true</testFailureIgnore>
<dependencies> </configuration>
<dependency> </plugin>
<artifactId>org.eclipse.platform.feature.group</artifactId> <plugin>
<version>3.7.0</version> <groupId>org.eclipse.tycho</groupId>
<type>p2-installable-unit</type> <artifactId>target-platform-configuration</artifactId>
</dependency> <configuration>
<dependency> <dependency-resolution>
<artifactId>org.eclipse.cdt.feature.group</artifactId> <extraRequirements>
<version>8.2.0.${buildQualifier}</version> <requirement>
<type>p2-installable-unit</type> <type>eclipse-feature</type>
</dependency> <id>org.eclipse.platform</id>
</dependencies> <versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

32
core/org.eclipse.cdt.core.tests/pom.xml
View file

@ -38,18 +38,26 @@
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>
<testFailureIgnore>true</testFailureIgnore> <testFailureIgnore>true</testFailureIgnore>
<dependencies> </configuration>
<dependency> </plugin>
<artifactId>org.eclipse.platform.feature.group</artifactId> <plugin>
<version>3.7.0</version> <groupId>org.eclipse.tycho</groupId>
<type>p2-installable-unit</type> <artifactId>target-platform-configuration</artifactId>
</dependency> <configuration>
<dependency> <dependency-resolution>
<artifactId>org.eclipse.cdt.feature.group</artifactId> <extraRequirements>
<version>8.2.0.${buildQualifier}</version> <requirement>
<type>p2-installable-unit</type> <type>eclipse-feature</type>
</dependency> <id>org.eclipse.platform</id>
</dependencies> <versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

32
core/org.eclipse.cdt.ui.tests/pom.xml
View file

@ -36,18 +36,26 @@
<include>**/AutomatedSuite.*</include> <include>**/AutomatedSuite.*</include>
</includes> </includes>
<testFailureIgnore>true</testFailureIgnore> <testFailureIgnore>true</testFailureIgnore>
<dependencies> </configuration>
<dependency> </plugin>
<artifactId>org.eclipse.platform.feature.group</artifactId> <plugin>
<version>3.7.0</version> <groupId>org.eclipse.tycho</groupId>
<type>p2-installable-unit</type> <artifactId>target-platform-configuration</artifactId>
</dependency> <configuration>
<dependency> <dependency-resolution>
<artifactId>org.eclipse.cdt.feature.group</artifactId> <extraRequirements>
<version>8.2.0.${buildQualifier}</version> <requirement>
<type>p2-installable-unit</type> <type>eclipse-feature</type>
</dependency> <id>org.eclipse.platform</id>
</dependencies> <versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

32
dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
View file

@ -39,18 +39,26 @@
<include>**/AllTests.*</include> <include>**/AllTests.*</include>
</includes> </includes>
<testFailureIgnore>true</testFailureIgnore> <testFailureIgnore>true</testFailureIgnore>
<dependencies> </configuration>
<dependency> </plugin>
<artifactId>org.eclipse.platform.feature.group</artifactId> <plugin>
<version>3.7.0</version> <groupId>org.eclipse.tycho</groupId>
<type>p2-installable-unit</type> <artifactId>target-platform-configuration</artifactId>
</dependency> <configuration>
<dependency> <dependency-resolution>
<artifactId>org.eclipse.cdt.feature.group</artifactId> <extraRequirements>
<version>8.2.0.${buildQualifier}</version> <requirement>
<type>p2-installable-unit</type> <type>eclipse-feature</type>
</dependency> <id>org.eclipse.platform</id>
</dependencies> <versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

32
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
View file

@ -62,18 +62,26 @@
<include>**/${gdbTestSuite}</include> <include>**/${gdbTestSuite}</include>
</includes> </includes>
<testFailureIgnore>true</testFailureIgnore> <testFailureIgnore>true</testFailureIgnore>
<dependencies> </configuration>
<dependency> </plugin>
<artifactId>org.eclipse.platform.feature.group</artifactId> <plugin>
<version>3.7.0</version> <groupId>org.eclipse.tycho</groupId>
<type>p2-installable-unit</type> <artifactId>target-platform-configuration</artifactId>
</dependency> <configuration>
<dependency> <dependency-resolution>
<artifactId>org.eclipse.cdt.feature.group</artifactId> <extraRequirements>
<version>8.2.0.${buildQualifier}</version> <requirement>
<type>p2-installable-unit</type> <type>eclipse-feature</type>
</dependency> <id>org.eclipse.platform</id>
</dependencies> <versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

6
pom.xml
View file

@ -15,8 +15,8 @@
<name>CDT Parent</name> <name>CDT Parent</name>
<properties> <properties>
<tycho-version>0.20.0</tycho-version> <tycho-version>0.21.0</tycho-version>
<tycho-extras-version>0.20.0</tycho-extras-version> <tycho-extras-version>0.21.0</tycho-extras-version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<cdt-site>http://hudson.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site> <cdt-site>http://hudson.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@ -296,7 +296,7 @@
<plugin> <plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId> <groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId> <artifactId>eclipse-jarsigner-plugin</artifactId>
<version>1.0.5</version> <version>1.1.1</version>
<executions> <executions>
<execution> <execution>
<id>sign</id> <id>sign</id>

83
releng/org.eclipse.cdt.testing.repo/pom.xml
View file

@ -14,92 +14,9 @@
<version>8.3.0-SNAPSHOT</version> <version>8.3.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.testing.repo</artifactId> <artifactId>org.eclipse.cdt.testing.repo</artifactId>
<packaging>eclipse-repository</packaging> <packaging>eclipse-repository</packaging>
<pluginRepositories>
<pluginRepository>
<id>cbi</id>
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
</pluginRepositories>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
</build> </build>
<profiles>
<profile>
<id>production</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>false</includePackedArtifacts>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-version}</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>${tycho-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
<goals>
<goal>pack</goal>
</goals>
<phase>verify</phase>
</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>verify</phase>
</execution>
</executions>
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>