diff options
| author | Alexander Kurtakov | 2015-06-08 11:37:41 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2015-06-08 12:05:50 +0000 |
| commit | bd663878c79417db618ccb7b59050dfc1ca8e601 (patch) | |
| tree | 1acedfc9eb0f4028699addb5d8747710a7c358bb /containers/pom.xml | |
| parent | bfa46e95970253245cfbcf657a37854b70fcabd7 (diff) | |
| download | org.eclipse.linuxtools-bd663878c79417db618ccb7b59050dfc1ca8e601.tar.gz org.eclipse.linuxtools-bd663878c79417db618ccb7b59050dfc1ca8e601.tar.xz org.eclipse.linuxtools-bd663878c79417db618ccb7b59050dfc1ca8e601.zip | |
releng: Update to Tycho 0.23.
* Few iu removed from docker site. Tycho 0.23 resolves from reactor and
as no bundle has dependency on these ius compilation failed.
* Drop versions of site modules.
* Have single definition of tycho versions as one can not mix two
versions in the same build.
* Update maven antrun and resources plugin to newer versions.
Change-Id: Id8b0db5acfec8af2a87a0c160a7c471ad4f7e6fe
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/49646
Tested-by: Hudson CI
Diffstat (limited to 'containers/pom.xml')
| -rw-r--r-- | containers/pom.xml | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/containers/pom.xml b/containers/pom.xml index af53e6c721..01eda223b4 100644 --- a/containers/pom.xml +++ b/containers/pom.xml @@ -13,14 +13,12 @@ </parent> <properties> - <tychoVersion>0.22.0</tychoVersion> - <tychoExtrasVersion>${tychoVersion}</tychoExtrasVersion> <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2> <systemProperties></systemProperties> <platformSystemProperties></platformSystemProperties> <applejdkProperties></applejdkProperties> - <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version> + <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version> <tycho.scmUrl>scm:git:https://github.com/jbdevstudio/linuxtools-docker.git</tycho.scmUrl> </properties> @@ -31,24 +29,12 @@ <module>org.eclipse.linuxtools.docker-feature</module> </modules> - <repositories> - <repository> - <id>mars</id> - <layout>p2</layout> - <url>http://download.eclipse.org/releases/mars</url> - </repository> - <repository> - <id>license</id> - <layout>p2</layout> - <url>http://download.eclipse.org/cbi/updates/license</url> - </repository> - </repositories> <build> <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-packaging-plugin</artifactId> - <version>${tychoVersion}</version> + <version>${tycho-version}</version> <configuration> <sourceReferences> <generate>true</generate> @@ -86,7 +72,7 @@ <dependency> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-sourceref-jgit</artifactId> - <version>${tychoExtrasVersion}</version> + <version>${tycho-extras-version}</version> </dependency> </dependencies> </plugin> @@ -94,14 +80,14 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-maven-plugin</artifactId> - <version>${tychoVersion}</version> + <version>${tycho-version}</version> <extensions>true</extensions> </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-compiler-plugin</artifactId> - <version>${tychoVersion}</version> + <version>${tycho-version}</version> <configuration> <encoding>UTF-8</encoding> </configuration> @@ -110,7 +96,7 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-source-plugin</artifactId> - <version>${tychoVersion}</version> + <version>${tycho-version}</version> <executions> <execution> <id>plugin-source</id> @@ -123,7 +109,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.4.1</version> + <version>2.7</version> <configuration> <encoding>ISO-8859-1</encoding> </configuration> |