Permalink
Browse files

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...
1 parent 18173e9 commit 87d4445233f8dd473e2866eee4b54b1c156522a7 @fsteeg fsteeg committed Apr 27, 2012
View
1 minerva-eclipse-project-archetype/pom.xml
@@ -41,6 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>1.5</version>
<executions>
<execution>
<id>generate-projects</id>
View
4 ...ct-archetype/src/main/resources/archetype-resources/__rootArtifactId__.core.tests/pom.xml
@@ -19,8 +19,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<excludes>
View
5 ...archetype/src/main/resources/archetype-resources/__rootArtifactId__.core/build.properties
@@ -3,8 +3,7 @@
#set( $symbol_escape = '\' )
source.. = src/
output.. = bin/
-bin.includes = plugin.xml,${symbol_escape}
- META-INF/,${symbol_escape}
+bin.includes = META-INF/,${symbol_escape}
.,${symbol_escape}
- icons/,${symbol_escape}
+ OSGI-INF/,${symbol_escape}
OSGI-INF/l10n/bundle.properties
View
6 ...-archetype/src/main/resources/archetype-resources/__rootArtifactId__.doc/build.properties
@@ -6,8 +6,4 @@ bin.includes = META-INF/,${symbol_escape}
about.html,${symbol_escape}
help/,${symbol_escape}
plugin.properties,${symbol_escape}
- plugin.xml,${symbol_escape}
- images/,${symbol_escape}
- intro/,${symbol_escape}
- cheatsheets/,${symbol_escape}
- contexts.xml
+ plugin.xml
View
9 ...ject-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui.tests/pom.xml
@@ -14,20 +14,11 @@
<name>${projectName} UI Test Plug-in (Incubation)</name>
<properties>
- <local-p2-site>file:/${basedir}/../${rootArtifactId}-repository/target/repository</local-p2-site>
<ui.test.vmargs.all>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs.all>
<ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
<ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
</properties>
- <repositories>
- <repository>
- <id>local-p2</id>
- <layout>p2</layout>
- <url>${local-p2-site}</url>
- </repository>
- </repositories>
-
<profiles>
<profile>
<id>skip-ui-tests</id>
View
1 ...t-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui/build.properties
@@ -7,4 +7,5 @@ bin.includes = plugin.xml,${symbol_escape}
META-INF/,${symbol_escape}
.,${symbol_escape}
icons/,${symbol_escape}
+ OSGI-INF/,${symbol_escape}
OSGI-INF/l10n/bundle.properties
View
2 minerva-eclipse-project-archetype/src/main/resources/archetype-resources/pom.xml
@@ -26,7 +26,7 @@
</licenses>
<properties>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<platform-version-name>helios</platform-version-name>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
View
7 org.aniszczyk.minerva.core/build.properties
@@ -1,7 +1,6 @@
source.. = src/
output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
+bin.includes = META-INF/,\
.,\
- icons/,\
- OSGI-INF/l10n/bundle.properties
+ OSGI-INF/l10n/bundle.properties,\
+ OSGI-INF/
View
5 org.aniszczyk.minerva.doc/build.properties
@@ -4,7 +4,4 @@ bin.includes = META-INF/,\
help/,\
plugin.properties,\
plugin.xml,\
- images/,\
- intro/,\
- cheatsheets/,\
- contexts.xml
+ images/
View
9 org.aniszczyk.minerva.tests.ui/pom.xml
@@ -25,20 +25,11 @@
<name>Minerva UI Test Plug-in (Incubation)</name>
<properties>
- <local-p2-site>file:/${basedir}/../org.aniszczyk.minerva-repository/target/repository</local-p2-site>
<ui.test.vmargs.all>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs.all>
<ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
<ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
</properties>
- <repositories>
- <repository>
- <id>local-p2</id>
- <layout>p2</layout>
- <url>${local-p2-site}</url>
- </repository>
- </repositories>
-
<profiles>
<profile>
<id>skip-ui-tests</id>
View
3 org.aniszczyk.minerva.ui/build.properties
@@ -4,4 +4,5 @@ bin.includes = plugin.xml,\
META-INF/,\
.,\
icons/,\
- OSGI-INF/l10n/bundle.properties
+ OSGI-INF/l10n/bundle.properties,\
+ OSGI-INF/
View
2 pom.xml
@@ -39,7 +39,7 @@
</licenses>
<properties>
- <tycho-version>0.13.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<platform-version-name>helios</platform-version-name>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>

0 comments on commit 87d4445

Please sign in to comment.