mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

move deps from terminal/admin/pom-config.xml to root pom; update to simrel 2018-09 / eclipse 4.9 deps

Browse source 
Change-Id: I65607fcaabd7ea7670eb7e5e90c560f144ae1a8e
Signed-off-by: nickboldt <nboldt@redhat.com>
This commit is contained in:
nickboldt 2018-08-28 14:25:41 -04:00
parent 9badfb9ff4
commit fa7889d89d
2 changed files with 38 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pom.xml
View file

@ -14,16 +14,38 @@
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
<tycho-version>1.2.0</tycho-version> <tycho-version>1.2.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version> <tycho-extras-version>${tycho-version}</tycho-extras-version>
<maven-resources-version>2.7</maven-resources-version>
<!-- TODO: switch to 4.9-I-builds after June 27, 2018 -->
<sdk-version>4.8</sdk-version>
<maven-resources-version>2.7</maven-resources-version>
<maven-antrun-version>1.8</maven-antrun-version>
<gmaven-version>1.5</gmaven-version>
<findbugs-version>3.0.4</findbugs-version>
<!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
<jacoco-version>0.7.9</jacoco-version>
<eclipse-jarsigner-version>1.1.4</eclipse-jarsigner-version>
<sdk-version>4.9-I-builds</sdk-version>
<!-- Set up the default target platform to build against --> <!-- Set up the default target platform to build against -->
<license-site>http://download.eclipse.org/cbi/updates/license</license-site> <license-site>http://download.eclipse.org/cbi/updates/license</license-site>
<platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site> <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository</orbit-site> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository</orbit-site>
<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site> <cdt-site>http://download.eclipse.org/tools/cdt/builds/9.4</cdt-site>
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/nightly/</remote-site>
<!-- <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/photon/milestones/</remote-site> -->
<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
<!-- TODO remove dep on terminal and tm since in the same reactor now -->
<terminal-site>http://download.eclipse.org/tm/terminal/builds/development/nightly</terminal-site> <terminal-site>http://download.eclipse.org/tm/terminal/builds/development/nightly</terminal-site>
<tm-site>http://download.eclipse.org/tm/updates/3.7.100/repository/</tm-site>
<!-- TODO: remove dep on simrel site -->
<!-- <platform-release-site>http://download.eclipse.org/staging/photon/</platform-release-site> -->
<platform-release-site>http://download.eclipse.org/staging/2018-09/</platform-release-site>
<!-- TODO: remove this? TCF needs gson-2.2.4 which was added to Orbit in Luna SR2 -->
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
<!-- provides gnu.io for the update site -->
<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
</properties> </properties>
<repositories> <repositories>
@ -52,6 +74,11 @@
<url>${terminal-site}</url> <url>${terminal-site}</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
<repository>
<id>rxtx</id>
<url>${rxtx-site}</url>
<layout>p2</layout>
</repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>

55
terminal/admin/pom-config.xml
View file

@ -4,9 +4,12 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<prerequisites> <parent>
<maven>3.0</maven> <groupId>org.eclipse.tm</groupId>
</prerequisites> <artifactId>tm-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.tm.terminal</groupId> <groupId>org.eclipse.tm.terminal</groupId>
<artifactId>org.eclipse.tm.terminal.maven-config</artifactId> <artifactId>org.eclipse.tm.terminal.maven-config</artifactId>
@ -36,24 +39,6 @@
</organization> </organization>
<properties> <properties>
<!-- Define version id's to be used in the plugins section -->
<!-- We use tycho-0.23 for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459873 -->
<!-- We cannot use tycho-0.25 or later since it doesn't support Java 7
for building -->
<!-- Using Java 8 for Tycho with a Java 7 target should be possible but
takes some config -->
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
<tycho-version>1.2.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<maven-resources-version>2.7</maven-resources-version>
<maven-antrun-version>1.8</maven-antrun-version>
<gmaven-version>1.5</gmaven-version>
<findbugs-version>3.0.4</findbugs-version>
<!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
<jacoco-version>0.7.9</jacoco-version>
<!-- Note: jarsigner-1.1.4 fails with Java 7 so stick to 1.1.2 -->
<eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
<!-- Common global properties --> <!-- Common global properties -->
<adminDir>${env.WORKSPACE}/admin</adminDir> <adminDir>${env.WORKSPACE}/admin</adminDir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -68,27 +53,6 @@
<terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install> <terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
<sdk-version>4.7</sdk-version>
<!-- Set up Mars as the default target platform to build against, -->
<!-- Because it supports Java 7, but also already has the cdt.native.serial
plugin. -->
<!-- Also, PTP o.e.remote-2.0 from Mars is the oldest remote version that
we can support. -->
<platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
<platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
<tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site>
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
<!-- TCF needs gson-2.2.4 which was added to Orbit in Luna SR2 -->
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
<!-- SWTBot-2.4 and later require an e4-based Eclipse eg Juno or later: -->
<!-- See http://wiki.eclipse.org/SWTBot/Releases -->
<!-- Also, newer SWTBot needs JUnit 4.12 which is only in Orbit Mars and
newer -->
<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.2.1/</swtbot-site>
</properties> </properties>
<repositories> <repositories>
@ -132,11 +96,6 @@
<url>${remote-site}</url> <url>${remote-site}</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
<repository>
<id>rxtx</id>
<url>${rxtx-site}</url>
<layout>p2</layout>
</repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
@ -256,7 +215,7 @@
<platform-release-site>http://download.eclipse.org/staging/photon/</platform-release-site> <platform-release-site>http://download.eclipse.org/staging/photon/</platform-release-site>
<!-- <platform-release-site>http://download.eclipse.org/releases/photon/</platform-release-site> --> <!-- <platform-release-site>http://download.eclipse.org/releases/photon/</platform-release-site> -->
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/</orbit-site> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/</orbit-site>
<tm-site>http://download.eclipse.org/tm/updates/3.7.100-SNAPSHOT/repository/</tm-site> <tm-site>http://download.eclipse.org/tm/updates/3.7.100/repository/</tm-site>
<!-- <tm-site>http://download.eclipse.org/tm/updates/3.7.100/repository/</tm-site> --> <!-- <tm-site>http://download.eclipse.org/tm/updates/3.7.100/repository/</tm-site> -->
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/nightly/</remote-site> <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/nightly/</remote-site>
<!-- <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/photon/milestones/</remote-site> --> <!-- <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/photon/milestones/</remote-site> -->