Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2014-07-16 01:37:25 +0000
committerMarc-Andre Laperle2014-07-31 15:19:17 +0000
commit86a08c918ea292e8b4838b489944449843ea6506 (patch)
treea17a01f1ee431f652bc892fbcc09c81d59468de0
parentf17501b981255b1e62c61b17722aa7bcf054c8fe (diff)
downloadorg.eclipse.cdt-86a08c918ea292e8b4838b489944449843ea6506.tar.gz
org.eclipse.cdt-86a08c918ea292e8b4838b489944449843ea6506.tar.xz
org.eclipse.cdt-86a08c918ea292e8b4838b489944449843ea6506.zip
Upgrade to Tycho 0.21.0
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>
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml32
-rw-r--r--core/org.eclipse.cdt.core.tests/pom.xml32
-rw-r--r--core/org.eclipse.cdt.ui.tests/pom.xml32
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml32
-rw-r--r--dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml32
-rw-r--r--pom.xml6
-rw-r--r--releng/org.eclipse.cdt.testing.repo/pom.xml83
7 files changed, 103 insertions, 146 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
index 3ca0d94922..8e0174e6a7 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
@@ -38,18 +38,26 @@
<include>**/AllManagedBuildTests.*</include>
</includes>
<testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <version>3.7.0</version>
- <type>p2-installable-unit</type>
- </dependency>
- <dependency>
- <artifactId>org.eclipse.cdt.feature.group</artifactId>
- <version>8.2.0.${buildQualifier}</version>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.platform</id>
+ <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>
</plugin>
</plugins>
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index d7bf18e9df..39beaf2e44 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -38,18 +38,26 @@
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
<testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <version>3.7.0</version>
- <type>p2-installable-unit</type>
- </dependency>
- <dependency>
- <artifactId>org.eclipse.cdt.feature.group</artifactId>
- <version>8.2.0.${buildQualifier}</version>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.platform</id>
+ <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>
</plugin>
</plugins>
diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml
index ac34e3e239..48825e4390 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml
@@ -36,18 +36,26 @@
<include>**/AutomatedSuite.*</include>
</includes>
<testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <version>3.7.0</version>
- <type>p2-installable-unit</type>
- </dependency>
- <dependency>
- <artifactId>org.eclipse.cdt.feature.group</artifactId>
- <version>8.2.0.${buildQualifier}</version>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.platform</id>
+ <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>
</plugin>
</plugins>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
index 29ea381aed..63ee806ec5 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
@@ -39,18 +39,26 @@
<include>**/AllTests.*</include>
</includes>
<testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <version>3.7.0</version>
- <type>p2-installable-unit</type>
- </dependency>
- <dependency>
- <artifactId>org.eclipse.cdt.feature.group</artifactId>
- <version>8.2.0.${buildQualifier}</version>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.platform</id>
+ <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>
</plugin>
</plugins>
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
index f9003f8b2b..730e3c9081 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
@@ -62,18 +62,26 @@
<include>**/${gdbTestSuite}</include>
</includes>
<testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <version>3.7.0</version>
- <type>p2-installable-unit</type>
- </dependency>
- <dependency>
- <artifactId>org.eclipse.cdt.feature.group</artifactId>
- <version>8.2.0.${buildQualifier}</version>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.platform</id>
+ <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>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 9e752bab3e..5177006dd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,8 @@
<name>CDT Parent</name>
<properties>
- <tycho-version>0.20.0</tycho-version>
- <tycho-extras-version>0.20.0</tycho-extras-version>
+ <tycho-version>0.21.0</tycho-version>
+ <tycho-extras-version>0.21.0</tycho-extras-version>
<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>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -296,7 +296,7 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.0.5</version>
+ <version>1.1.1</version>
<executions>
<execution>
<id>sign</id>
diff --git a/releng/org.eclipse.cdt.testing.repo/pom.xml b/releng/org.eclipse.cdt.testing.repo/pom.xml
index d692c2a459..a2a1444326 100644
--- a/releng/org.eclipse.cdt.testing.repo/pom.xml
+++ b/releng/org.eclipse.cdt.testing.repo/pom.xml
@@ -14,92 +14,9 @@
<version>8.3.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.testing.repo</artifactId>
<packaging>eclipse-repository</packaging>
-
- <pluginRepositories>
- <pluginRepository>
- <id>cbi</id>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<finalName>${project.artifactId}</finalName>
</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>

Back to the top