Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorRalf Sternberg2011-10-02 09:20:15 +0000
committerRalf Sternberg2011-10-02 09:20:15 +0000
commite5e96600f23061422cf8eb86482b2d3f798de28a (patch)
tree8ca3b708693f8c1e39c3ac4ce39873f8b599c9a0 /releng
parent07d626613bdcd1be40ed32ff021485e145dbe085 (diff)
downloadorg.eclipse.rap-e5e96600f23061422cf8eb86482b2d3f798de28a.tar.gz
org.eclipse.rap-e5e96600f23061422cf8eb86482b2d3f798de28a.tar.xz
org.eclipse.rap-e5e96600f23061422cf8eb86482b2d3f798de28a.zip
Merge runtime build and test build - bug 354781: [Releng] Evaluate tycho for building RAP
https://bugs.eclipse.org/bugs/show_bug.cgi?id=354781
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.rap.releng/runtime/pom-test.xml113
-rw-r--r--releng/org.eclipse.rap.releng/runtime/pom.xml70
2 files changed, 62 insertions, 121 deletions
diff --git a/releng/org.eclipse.rap.releng/runtime/pom-test.xml b/releng/org.eclipse.rap.releng/runtime/pom-test.xml
deleted file mode 100644
index 4bbcd31a3b..0000000000
--- a/releng/org.eclipse.rap.releng/runtime/pom-test.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, EclipseSource and others
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- EclipseSource - initial implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <tycho-version>0.12.0</tycho-version>
- <surefire-version>2.9</surefire-version>
- <mockito-version>1.8.4</mockito-version>
- <junit-version>3.8.2</junit-version>
- <rap-version>1.5.0</rap-version>
- </properties>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <name>Parent POM for RAP runtime test build</name>
-
- <groupId>org.eclipse.rap</groupId>
- <artifactId>org.eclipse.rap.runtime-test-parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.test</module>
- <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.osgi.test</module>
- </modules>
-
- <!-- repositories to get pre-built pieces from -->
- <repositories>
- <repository>
- <id>rap-runtime</id>
- <layout>p2</layout>
- <url>file://${runtimeRepo}</url>
- </repository>
- <repository>
- <id>test-dependencies</id>
- <layout>p2</layout>
- <url>file://${testDepsRepo}</url>
- </repository>
- </repositories>
-
- <build>
- <plugins>
-
- <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-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <format>yyyyMMdd-HHmm</format>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-version}</version>
- <executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <configuration>
- <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
- <includes>
- <include>**/*_Test.java</include>
- </includes>
- </configuration>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/releng/org.eclipse.rap.releng/runtime/pom.xml b/releng/org.eclipse.rap.releng/runtime/pom.xml
index 292baa9bff..c0d03df1b2 100644
--- a/releng/org.eclipse.rap.releng/runtime/pom.xml
+++ b/releng/org.eclipse.rap.releng/runtime/pom.xml
@@ -14,16 +14,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
<properties>
<tycho-version>0.13.0</tycho-version>
- <rap-version>1.5.0</rap-version>
+ <surefire-version>2.9</surefire-version>
+ <junit-version>3.8.2</junit-version>
+ <mockito-version>1.8.4</mockito-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
<name>RAP Runtime build</name>
<groupId>org.eclipse.rap</groupId>
@@ -32,8 +34,7 @@
<packaging>pom</packaging>
<modules>
- <module>runtime-feature</module>
- <module>runtime-repository</module>
+ <!-- Runtime projects -->
<module>../../../runtime.rwt/org.eclipse.rap.rwt</module>
<module>../../../runtime.rwt/org.eclipse.rap.rwt.osgi</module>
<module>../../../runtime.rwt/org.eclipse.rap.rwt.theme.classic</module>
@@ -50,14 +51,30 @@
<module>../../../runtime.ui/org.eclipse.rap.ui.forms</module>
<module>../../../runtime.ui/org.eclipse.rap.ui.views</module>
<module>../../../runtime.ui/org.eclipse.rap.ui.workbench</module>
+ <!-- Test projects -->
+ <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.test</module>
+ <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.osgi.test</module>
+ <module>../../../runtime.ui.test/org.eclipse.rap.ui.forms.test</module>
+ <!--
+ <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.themes.test</module>
+ <module>../../../runtime.rwt.test/org.eclipse.rwt.widgets.styledtext.test</module>
+ -->
+ <!-- Packaging projects -->
+ <module>runtime-feature</module>
+ <module>runtime-repository</module>
</modules>
<repositories>
<repository>
- <id>runtime</id>
+ <id>platform-base-repository</id>
<layout>p2</layout>
<url>file://${runtimeRepo}</url>
</repository>
+ <repository>
+ <id>test-dependencies-repository</id>
+ <layout>p2</layout>
+ <url>file://${testDepsRepo}</url>
+ </repository>
</repositories>
<pluginRepositories>
@@ -100,7 +117,44 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-version}</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <configuration>
+ <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+ <includes>
+ <include>**/*_Test.java</include>
+ </includes>
+ <runOrder>random</runOrder>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>

Back to the top