Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Le Fevre - CEA2016-06-22 20:43:59 -0400
committerFrancois Le Fevre - CEA2016-06-23 08:45:19 -0400
commit1ff2b4c123cc3e0924a27cc204b73b509f29c8f7 (patch)
tree1bae8b7dfbfdc24095bea7e10a6c3a8557ea919c
parent308453f3af877c18a3c33c6b6dc5f223e44007d5 (diff)
downloadorg.eclipse.papyrus-1ff2b4c123cc3e0924a27cc204b73b509f29c8f7.tar.gz
org.eclipse.papyrus-1ff2b4c123cc3e0924a27cc204b73b509f29c8f7.tar.xz
org.eclipse.papyrus-1ff2b4c123cc3e0924a27cc204b73b509f29c8f7.zip
Bug 494140 - [releng] switching to tycho 0.25.0
Change-Id: I2cc5a356ba9ef632d8af055948ac68e6d22ec096 Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
-rw-r--r--releng/pom.xml272
-rw-r--r--releng/toolkit/aggregator/pom.xml4
2 files changed, 138 insertions, 138 deletions
diff --git a/releng/pom.xml b/releng/pom.xml
index df32ee3fbd0..9de7de42ec6 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -1,141 +1,141 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.all.releng</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <properties>
- <tycho-version>0.23.1</tycho-version>
- <tychoExtrasVersion>0.23.1</tychoExtrasVersion>
- <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>
- <jarSignerVersion>1.1.2</jarSignerVersion>
- <findbugs.version>3.0.1</findbugs.version>
- <xtext.version>2.7.3</xtext.version>
- <java.source.version>1.8</java.source.version>
- <java.target.version>1.8</java.target.version>
- <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
- <skipAllTests>false</skipAllTests>
- <skipInnerTests>true</skipInnerTests>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.all.releng</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.25.0</tycho-version>
+ <tychoExtrasVersion>0.25.0</tychoExtrasVersion>
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>
+ <jarSignerVersion>1.1.2</jarSignerVersion>
+ <findbugs.version>3.0.1</findbugs.version>
+ <xtext.version>2.7.3</xtext.version>
+ <java.source.version>1.8</java.source.version>
+ <java.target.version>1.8</java.target.version>
+ <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+ <skipAllTests>false</skipAllTests>
+ <skipInnerTests>true</skipInnerTests>
+
<!-- TODO: Is it possible to automatically detect that we are building
this pom rather than a child pom? That would remove the need for this manual
- variable -->
+ variable -->
<buildAll>false</buildAll> <!-- Set to true when building this pom directly (Rather than individual
components). This will disable Papyrus Update Sites (Since they are being
- built by this POM). -->
-
+ built by this POM). -->
+
<!-- Papyrus repositories. Used when we're building individual components
- (vs building the parent pom including everything) -->
- <papyrus.eclipse.target>oxygen</papyrus.eclipse.target>
- <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Deprecated; kept for Legacy. Can be set to file:/home/data/httpd/download.eclipse.org when building on HIPP -->
- <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
- <papyrus.repo.extra>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>
- <papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev>
- <target.suffix>portable</target.suffix> <!-- set to 'eclipse' when building on HIPP, to improve performances -->
- </properties>
-
- <modules>
- <module>main</module>
- <module>extra</module>
- <module>dev</module>
- <module>main-tests</module>
- <module>extra-tests</module>
- </modules>
-
- <pluginRepositories>
- <pluginRepository>
- <id>org.eclipse.cbi.maven.plugins</id>
- <name>Eclipse CBI</name>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>eclipse.org-mylyn</id>
- <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
- <url>https://repo.eclipse.org/content/repositories/mylyn/</url>
- </pluginRepository>
- </pluginRepositories>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
- <version>${xtext.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- <target>
- <artifact>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>${target.platform}</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </artifact>
- </target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+ (vs building the parent pom including everything) -->
+ <papyrus.eclipse.target>oxygen</papyrus.eclipse.target>
+ <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Deprecated; kept for Legacy. Can be set to file:/home/data/httpd/download.eclipse.org when building on HIPP -->
+ <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
+ <papyrus.repo.extra>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>
+ <papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev>
+ <target.suffix>portable</target.suffix> <!-- set to 'eclipse' when building on HIPP, to improve performances -->
+ </properties>
+
+ <modules>
+ <module>main</module>
+ <module>extra</module>
+ <module>dev</module>
+ <module>main-tests</module>
+ <module>extra-tests</module>
+ </modules>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.eclipse.cbi.maven.plugins</id>
+ <name>Eclipse CBI</name>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>eclipse.org-mylyn</id>
+ <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
+ <url>https://repo.eclipse.org/content/repositories/mylyn/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <version>${xtext.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ <target>
+ <artifact>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>${target.platform}</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/releng/toolkit/aggregator/pom.xml b/releng/toolkit/aggregator/pom.xml
index 676c4b01722..83d6f466737 100644
--- a/releng/toolkit/aggregator/pom.xml
+++ b/releng/toolkit/aggregator/pom.xml
@@ -6,8 +6,8 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <tycho-version>0.20.0</tycho-version>
- <tychoExtrasVersion>0.20.0</tychoExtrasVersion>
+ <tycho-version>0.250.0</tycho-version>
+ <tychoExtrasVersion>0.25.0</tychoExtrasVersion>
</properties>
<build>
<plugins>

Back to the top