Author: nickboldt
Date: 2010-03-28 11:51:35 -0400 (Sun, 28 Mar 2010)
New Revision: 21094
Modified:
trunk/genpom.scala
trunk/parent-pom.xml
Log:
backport from branch
Modified: trunk/genpom.scala
===================================================================
--- trunk/genpom.scala 2010-03-28 11:50:26 UTC (rev 21093)
+++ trunk/genpom.scala 2010-03-28 15:51:35 UTC (rev 21094)
@@ -156,8 +156,7 @@
)
val realModules = dirs.filter(
- (n) => n.isDirectory() && !n.getName().startsWith(".")
&& new File(new File(n, "META-INF"), "MANIFEST.MF").exists()
- )
+ (n) => n.isDirectory() && !n.getName().startsWith(".")
&& (new File(new File(n, "META-INF"), "MANIFEST.MF").exists()
|| (new File(n, "feature.xml").exists() &&
!n.getName().contains(".sdk."))))
var modules =
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-03-28 11:50:26 UTC (rev 21093)
+++ trunk/parent-pom.xml 2010-03-28 15:51:35 UTC (rev 21094)
@@ -60,6 +60,15 @@
</environments>
</configuration>
</plugin>
+<plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ </configuration>
+ </plugin>
</plugins>
</build>