From e2561ca6728ec1fd04ead35bb38e333aa4ec1a83 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 23 Jan 2015 19:33:08 +0100
Subject: [PATCH] Fixed maven build

---
 .../META-INF/MANIFEST.MF                      |  5 +-
 com.minres.scviewer.database.test/pom.xml     | 51 ++++++++-------
 .../database/test/DatabaseServicesTest.java   |  2 +-
 .../build.properties                          |  1 +
 com.minres.scviewer.database.text/pom.xml     | 63 ++++++++++++-------
 com.minres.scviewer.database.vcd/pom.xml      | 13 ----
 com.minres.scviewer.database/pom.xml          | 13 ----
 com.minres.scviewer.parent/pom.xml            | 44 ++++++++-----
 com.minres.scviewer.ui/pom.xml                | 13 ----
 9 files changed, 104 insertions(+), 101 deletions(-)

diff --git a/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
index c14c0b7..2995fbb 100644
--- a/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
@@ -6,5 +6,8 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GnbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit,
- com.minres.scviewer.database
+ com.minres.scviewer.database,
+ com.minres.scviewer.database.sqlite;bundle-version="1.0.0",
+ com.minres.scviewer.database.text;bundle-version="1.0.0",
+ com.minres.scviewer.database.vcd;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/com.minres.scviewer.database.test/pom.xml b/com.minres.scviewer.database.test/pom.xml
index 1177551..74ccb46 100644
--- a/com.minres.scviewer.database.test/pom.xml
+++ b/com.minres.scviewer.database.test/pom.xml
@@ -1,24 +1,29 @@
-<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>
-  <artifactId>com.minres.scviewer.database.test</artifactId>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <parent>
-  	<groupId>com.minres.scviewer</groupId>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
-  </parent>
-  <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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>com.minres.scviewer.database.test</artifactId>
+	<parent>
+		<groupId>com.minres.scviewer</groupId>
+		<artifactId>com.minres.scviewer.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../com.minres.scviewer.parent</relativePath>
+	</parent>
+	<packaging>eclipse-test-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<configuration>
+<!-- 					<bundleStartLevel /> -->
+					<dependencies>
+						<dependency>
+							<type>p2-installable-unit</type>
+							<artifactId>org.eclipse.equinox.ds</artifactId>
+						</dependency>
+					</dependencies>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java b/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
index 8177a1b..ded2470 100644
--- a/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
+++ b/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
@@ -34,7 +34,7 @@ public class DatabaseServicesTest {
 				return;
 			Thread.sleep(1000);
 		}
-		fail("OSGi dependencies unfulfilled");
+		assertEquals("OSGi dependencies unfulfilled", 3, WaveformDb.getLoaders().size());
     }
 
 	@After
diff --git a/com.minres.scviewer.database.text/build.properties b/com.minres.scviewer.database.text/build.properties
index 7856cb9..b230e6c 100644
--- a/com.minres.scviewer.database.text/build.properties
+++ b/com.minres.scviewer.database.text/build.properties
@@ -11,4 +11,5 @@
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/
+bin.excludes = **/*.groovy
 source.. = src/
diff --git a/com.minres.scviewer.database.text/pom.xml b/com.minres.scviewer.database.text/pom.xml
index 7c55efb..28eba35 100644
--- a/com.minres.scviewer.database.text/pom.xml
+++ b/com.minres.scviewer.database.text/pom.xml
@@ -1,24 +1,41 @@
-<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>
-  <artifactId>com.minres.scviewer.database.text</artifactId>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <parent>
-  	<groupId>com.minres.scviewer</groupId>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
-  </parent>
-  <packaging>eclipse-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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>com.minres.scviewer.database.text</artifactId>
+	<parent>
+		<groupId>com.minres.scviewer</groupId>
+		<artifactId>com.minres.scviewer.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../com.minres.scviewer.parent</relativePath>
+	</parent>
+	<packaging>eclipse-plugin</packaging>
+	<build>
+	<plugins>
+				<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<configuration>
+					<compilerId>groovy-eclipse-compiler</compilerId>
+					<!-- set verbose to be true if you want lots of uninteresting messages -->
+					<!-- <verbose>true</verbose> -->
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-eclipse-compiler</artifactId>
+						<version>${groovy-eclipse-compiler-version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-eclipse-batch</artifactId>
+						<version>${groovy-eclipse-batch-version}</version>
+						<!-- or choose a different compiler version -->
+						<!-- <version>2.1.8-01</version> -->
+					</dependency>
+				</dependencies>
+			</plugin>
+	</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/com.minres.scviewer.database.vcd/pom.xml b/com.minres.scviewer.database.vcd/pom.xml
index 93264e1..9d50f5a 100644
--- a/com.minres.scviewer.database.vcd/pom.xml
+++ b/com.minres.scviewer.database.vcd/pom.xml
@@ -1,19 +1,6 @@
 <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>
   <artifactId>com.minres.scviewer.database.vcd</artifactId>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
diff --git a/com.minres.scviewer.database/pom.xml b/com.minres.scviewer.database/pom.xml
index 62180bb..30f8116 100644
--- a/com.minres.scviewer.database/pom.xml
+++ b/com.minres.scviewer.database/pom.xml
@@ -1,19 +1,6 @@
 <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>
   <artifactId>com.minres.scviewer.database</artifactId>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
diff --git a/com.minres.scviewer.parent/pom.xml b/com.minres.scviewer.parent/pom.xml
index 0feb310..d802dca 100644
--- a/com.minres.scviewer.parent/pom.xml
+++ b/com.minres.scviewer.parent/pom.xml
@@ -19,12 +19,23 @@
 	<properties>
 		<tycho.version>0.22.0</tycho.version>
 		<tycho-extras.version>0.22.0</tycho-extras.version>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<groovy-eclipse-compiler-version>2.9.1-01</groovy-eclipse-compiler-version>
+		<groovy-eclipse-batch-version>2.3.4-01</groovy-eclipse-batch-version>
 		<eclipse-repo.url>http://download.eclipse.org/releases/luna</eclipse-repo.url>
 		<groovy-repo.url>http://dist.springsource.org/release/GRECLIPSE/e4.4</groovy-repo.url>
 		<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
 	</properties>
 
+<!-- 	<dependencies> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.codehaus.groovy</groupId> -->
+<!-- 			<artifactId>groovy-all</artifactId> -->
+<!-- 			<version>2.3.7</version> -->
+<!-- 			<type>jar</type> -->
+<!-- 			<classifier>indy</classifier> -->
+<!-- 		</dependency> -->
+<!-- 	</dependencies> -->
 
 	<repositories>
 		<repository>
@@ -53,6 +64,7 @@
 	</pluginRepositories>
 
 	<build>
+	    <sourceDirectory>src</sourceDirectory>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
@@ -60,7 +72,6 @@
 				<version>${tycho.version}</version>
 				<extensions>true</extensions>
 			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
@@ -94,7 +105,6 @@
 					</environments>
 				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -107,8 +117,15 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
 		</plugins>
-
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -124,7 +141,7 @@
 						<compilerArguments>
 							<inlineJSR />
 							<enableJavadoc />
-							<encoding>ISO-8859-1</encoding>
+							<encoding>UTF-8</encoding>
 						</compilerArguments>
 					</configuration>
 				</plugin>
@@ -139,14 +156,10 @@
 							<version>${tycho-extras.version}</version>
 						</dependency>
 					</dependencies>
-<!-- 					<configuration>
-						<strictBinIncludes>false</strictBinIncludes>
-						<format>'v'yyyyMMdd-HHmm</format>
-						<timestampProvider>jgit</timestampProvider>
-						<jgit.ignore>
-						</jgit.ignore>
-					</configuration>
- -->				</plugin>
+					<!-- <configuration> <strictBinIncludes>false</strictBinIncludes> <format>'v'yyyyMMdd-HHmm</format> 
+						<timestampProvider>jgit</timestampProvider> <jgit.ignore> </jgit.ignore> 
+						</configuration> -->
+				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-surefire-plugin</artifactId>
@@ -189,7 +202,10 @@
 						<baselineReplace>none</baselineReplace>
 						<baselineRepositories>
 							<repository>
-								<url>http://download.eclipse.org/eclipse/updates/4.4</url>
+								<url>${eclipse-repo.url}</url>
+							</repository>
+							<repository>
+								<url>${groovy-repo.url}</url>
 							</repository>
 						</baselineRepositories>
 					</configuration>
diff --git a/com.minres.scviewer.ui/pom.xml b/com.minres.scviewer.ui/pom.xml
index 74d211a..6714758 100644
--- a/com.minres.scviewer.ui/pom.xml
+++ b/com.minres.scviewer.ui/pom.xml
@@ -1,19 +1,6 @@
 <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>
   <artifactId>com.minres.scviewer.ui</artifactId>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>