Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Build with Tycho 0.14.1

Required some cleanup in build.properties files due to stricter
checks by Tycho 0.14, and minor tweaks in poms. For details, see
the Tycho release notes at:

http://wiki.eclipse.org/Tycho/Release_Notes/0.14
  • Loading branch information...
commit 87d4445233f8dd473e2866eee4b54b1c156522a7 1 parent 18173e9
Fabian Steeg fsteeg authored
1  minerva-eclipse-project-archetype/pom.xml
@@ -41,6 +41,7 @@
41 41 <plugin>
42 42 <groupId>org.apache.maven.plugins</groupId>
43 43 <artifactId>maven-invoker-plugin</artifactId>
  44 + <version>1.5</version>
44 45 <executions>
45 46 <execution>
46 47 <id>generate-projects</id>
4 ...a-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.core.tests/pom.xml
@@ -19,8 +19,8 @@
19 19 <build>
20 20 <plugins>
21 21 <plugin>
22   - <groupId>org.sonatype.tycho</groupId>
23   - <artifactId>maven-osgi-test-plugin</artifactId>
  22 + <groupId>org.eclipse.tycho</groupId>
  23 + <artifactId>tycho-surefire-plugin</artifactId>
24 24 <version>${tycho-version}</version>
25 25 <configuration>
26 26 <excludes>
5 ...clipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.core/build.properties
@@ -3,8 +3,7 @@
3 3 #set( $symbol_escape = '\' )
4 4 source.. = src/
5 5 output.. = bin/
6   -bin.includes = plugin.xml,${symbol_escape}
7   - META-INF/,${symbol_escape}
  6 +bin.includes = META-INF/,${symbol_escape}
8 7 .,${symbol_escape}
9   - icons/,${symbol_escape}
  8 + OSGI-INF/,${symbol_escape}
10 9 OSGI-INF/l10n/bundle.properties
6 ...eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.doc/build.properties
@@ -6,8 +6,4 @@ bin.includes = META-INF/,${symbol_escape}
6 6 about.html,${symbol_escape}
7 7 help/,${symbol_escape}
8 8 plugin.properties,${symbol_escape}
9   - plugin.xml,${symbol_escape}
10   - images/,${symbol_escape}
11   - intro/,${symbol_escape}
12   - cheatsheets/,${symbol_escape}
13   - contexts.xml
  9 + plugin.xml
9 ...rva-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui.tests/pom.xml
@@ -14,20 +14,11 @@
14 14 <name>${projectName} UI Test Plug-in (Incubation)</name>
15 15
16 16 <properties>
17   - <local-p2-site>file:/${basedir}/../${rootArtifactId}-repository/target/repository</local-p2-site>
18 17 <ui.test.vmargs.all>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs.all>
19 18 <ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
20 19 <ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
21 20 </properties>
22 21
23   - <repositories>
24   - <repository>
25   - <id>local-p2</id>
26   - <layout>p2</layout>
27   - <url>${local-p2-site}</url>
28   - </repository>
29   - </repositories>
30   -
31 22 <profiles>
32 23 <profile>
33 24 <id>skip-ui-tests</id>
1  ...-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui/build.properties
@@ -7,4 +7,5 @@ bin.includes = plugin.xml,${symbol_escape}
7 7 META-INF/,${symbol_escape}
8 8 .,${symbol_escape}
9 9 icons/,${symbol_escape}
  10 + OSGI-INF/,${symbol_escape}
10 11 OSGI-INF/l10n/bundle.properties
2  minerva-eclipse-project-archetype/src/main/resources/archetype-resources/pom.xml
@@ -26,7 +26,7 @@
26 26 </licenses>
27 27
28 28 <properties>
29   - <tycho-version>0.13.0</tycho-version>
  29 + <tycho-version>0.14.1</tycho-version>
30 30 <platform-version-name>helios</platform-version-name>
31 31 <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
32 32 <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
7 org.aniszczyk.minerva.core/build.properties
... ... @@ -1,7 +1,6 @@
1 1 source.. = src/
2 2 output.. = bin/
3   -bin.includes = plugin.xml,\
4   - META-INF/,\
  3 +bin.includes = META-INF/,\
5 4 .,\
6   - icons/,\
7   - OSGI-INF/l10n/bundle.properties
  5 + OSGI-INF/l10n/bundle.properties,\
  6 + OSGI-INF/
5 org.aniszczyk.minerva.doc/build.properties
@@ -4,7 +4,4 @@ bin.includes = META-INF/,\
4 4 help/,\
5 5 plugin.properties,\
6 6 plugin.xml,\
7   - images/,\
8   - intro/,\
9   - cheatsheets/,\
10   - contexts.xml
  7 + images/
9 org.aniszczyk.minerva.tests.ui/pom.xml
@@ -25,20 +25,11 @@
25 25 <name>Minerva UI Test Plug-in (Incubation)</name>
26 26
27 27 <properties>
28   - <local-p2-site>file:/${basedir}/../org.aniszczyk.minerva-repository/target/repository</local-p2-site>
29 28 <ui.test.vmargs.all>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs.all>
30 29 <ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
31 30 <ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
32 31 </properties>
33 32
34   - <repositories>
35   - <repository>
36   - <id>local-p2</id>
37   - <layout>p2</layout>
38   - <url>${local-p2-site}</url>
39   - </repository>
40   - </repositories>
41   -
42 33 <profiles>
43 34 <profile>
44 35 <id>skip-ui-tests</id>
3  org.aniszczyk.minerva.ui/build.properties
@@ -4,4 +4,5 @@ bin.includes = plugin.xml,\
4 4 META-INF/,\
5 5 .,\
6 6 icons/,\
7   - OSGI-INF/l10n/bundle.properties
  7 + OSGI-INF/l10n/bundle.properties,\
  8 + OSGI-INF/
2  pom.xml
@@ -39,7 +39,7 @@
39 39 </licenses>
40 40
41 41 <properties>
42   - <tycho-version>0.13.0</tycho-version>
  42 + <tycho-version>0.14.1</tycho-version>
43 43 <platform-version-name>helios</platform-version-name>
44 44 <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
45 45 <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>

0 comments on commit 87d4445

Please sign in to comment.
Something went wrong with that request. Please try again.