Skip to content

Commit

Permalink
Adding missing e4 feature into site's categories (fixes #1953)
Browse files Browse the repository at this point in the history 
   - update archetype parameters in order to make it build

Signed-off-by: Ondrej Dockal <odockal@redhat.com>
  • Loading branch information
@odockal @jkopriva
odockal authored and jkopriva committed Nov 1, 2018
1 parent 55819ac commit 01bde28
Show file tree
Hide file tree
Showing 12 changed files with 951 additions and 102 deletions.
210 changes: 111 additions & 99 deletions archetype/src/main/resources/archetype-resources/pom.xml
View file
@@ -1,115 +1,127 @@

#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
#if ($reddeer_version == "2.3.0")
#set ($rd_repository = 'http://download.eclipse.org/reddeer/releases/2.3.0/')
#if ($reddeer_version == "2.4.0" )
#set( $rd_repository = 'http://download.eclipse.org/reddeer/releases/2.4.0/' )
#else
#set ($rd_repository = 'http://download.eclipse.org/reddeer/snapshots/')
#set ( $rd_repository = 'http://download.eclipse.org/reddeer/snapshots/' )
#end
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId} :: test</name>
<description>${artifactId} test plugin</description>
<packaging>eclipse-test-plugin</packaging>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>${artifactId} :: test</name>
<description>${artifactId} test plugin</description>
<packaging>eclipse-test-plugin</packaging>

<prerequisites>
<maven>3.0</maven>
</prerequisites>

<prerequisites>
<maven>3.0</maven>
</prerequisites>
<properties>
<java.version>1.8</java.version>
<maven.version>3.0</maven.version>
<tycho.version>${tycho_version}</tycho.version>
<tycho.test.jvmArgs>-Xmx512m -XX:MaxPermSize=256m</tycho.test.jvmArgs>
<surefire.timeout>1200</surefire.timeout>
<platformSystemProperties></platformSystemProperties>
</properties>

<properties>
<java.version>1.5</java.version>
<maven.version>3.0</maven.version>
<tycho.version>${tycho_version}</tycho.version>
<tycho.test.jvmArgs>-Xmx512m -XX:MaxPermSize=256m</tycho.test.jvmArgs>
<surefire.timeout>1200</surefire.timeout>
<platformSystemProperties></platformSystemProperties>
</properties>
<repositories>
<repository>
<id>${eclipse_platform}</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/${eclipse_platform}</url>
</repository>
<repository>
<id>RedDeer</id>
<layout>p2</layout>
<url>${rd_repository}</url>
</repository>
</repositories>

<repositories>
<repository>
<id>${eclipse_platform}</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/${eclipse_platform}</url>
</repository>
<repository>
<id>RedDeer</id>
<layout>p2</layout>
<url>${rd_repository}</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-public</id>
<url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url>
</pluginRepository>
</pluginRepositories>

<pluginRepositories>
<pluginRepository>
<id>sonatype-public</id>
<url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<configuration>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.equinox.ds</id>
<versionRange>1.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<configuration>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<configuration>
<format>yyyyMMdd-HHmm</format>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<testSuite>${artifactId}</testSuite>
<testClass>${package}.AllRedDeerTests</testClass>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
<argLine>${symbol_dollar}{tycho.test.jvmArgs} ${symbol_dollar}{platformSystemProperties}</argLine>
<includes>
<include>**/AllTests.class</include>
<include>**/*AllTests*.class</include>
<include>**/*AllBotTests*.class</include>
<include>**/*AllRedDeerTests*.class</include>
<include>**/*TestSuite*.class</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<configuration>
<format>yyyyMMdd-HHmm</format>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${symbol_dollar}{tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<testSuite>${artifactId}</testSuite>
<testClass>${package}.AllRedDeerTests</testClass>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
<argLine>${symbol_dollar}{tycho.test.jvmArgs} ${symbol_dollar}{platformSystemProperties}</argLine>
<includes>
<include>**/AllTests.class</include>
<include>**/*AllTests*.class</include>
<include>**/*AllBotTests*.class</include>
<include>**/*AllRedDeerTests*.class</include>
<include>**/*TestSuite*.class</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profiles>
<profile>
<!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=388084 -->
<id>osx</id>
Expand Down
4 changes: 2 additions & 2 deletions archetype/src/test/resources/projects/eclipse-reddeer-archetype/archetype.properties
View file
Expand Up @@ -2,6 +2,6 @@ package=foo.bar.myplugin.simrel
version=1.0.0-SNAPSHOT
groupId=foo.bar.myplugin
artifactId=reddeer.archetype
tycho_version=0.22.0
eclipse_platform=photon
tycho_version=1.2.0
eclipse_platform=2018-12
reddeer_version=master
1 change: 1 addition & 0 deletions features/org.eclipse.reddeer.e4.feature/.gitignore
View file
@@ -0,0 +1 @@
/target
13 changes: 13 additions & 0 deletions features/org.eclipse.reddeer.e4.feature/build.properties
View file
@@ -0,0 +1,13 @@
###############################################################################
# Copyright (c) 2018 Red Hat, Inc and others.
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Red Hat, Inc - initial API and implementation
###############################################################################
bin.includes = feature.xml,\
feature.properties

0 comments on commit 01bde28

Please sign in to comment.