From 145dfbd74de222eeee14096795ec66f073d2c21c Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Mon, 13 Jan 2020 13:14:34 +0100
Subject: [PATCH] Fixed NP and updated build infrastructure and target platform

---
 .../META-INF/MANIFEST.MF                      |   5 +-
 com.minres.scviewer.database.test/pom.xml     |   2 +-
 .../org.eclipse.jdt.groovy.core.prefs         |   2 +-
 .../META-INF/MANIFEST.MF                      |   6 +-
 com.minres.scviewer.database.text/pom.xml     |  11 +-
 .../database/text/TextDbLoader.groovy         |   2 +-
 .../META-INF/MANIFEST.MF                      |   3 -
 com.minres.scviewer.parent/pom.xml            | 104 +++++++++---------
 ...rget => com.minres.scviewer.target.target} |   7 +-
 com.minres.scviewer.target/pom.xml            |   2 +-
 10 files changed, 68 insertions(+), 76 deletions(-)
 rename com.minres.scviewer.target/{photon.target => com.minres.scviewer.target.target} (83%)

diff --git a/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF b/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
index 7a73230..b801309 100644
--- a/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
@@ -5,10 +5,7 @@ Bundle-SymbolicName: com.minres.scviewer.database.sqlite
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.util;bundle-version="1.0.500",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
- org.eclipse.osgi.services;bundle-version="3.4.0"
+Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0"
 Bundle-ClassPath: .,sqlite-jdbc-3.8.7.jar
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
diff --git a/com.minres.scviewer.database.test/pom.xml b/com.minres.scviewer.database.test/pom.xml
index 789f91b..68f458a 100644
--- a/com.minres.scviewer.database.test/pom.xml
+++ b/com.minres.scviewer.database.test/pom.xml
@@ -14,7 +14,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>0.23.1</version>
+				<version>${tycho-version}</version>
 				<configuration>
 <!-- 					<bundleStartLevel /> -->
 					<dependencies>
diff --git a/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs b/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs
index 021403d..74af1ba 100644
--- a/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs
+++ b/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-groovy.compiler.level=26
+groovy.compiler.level=25
diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index 61b0865..b98eea8 100644
--- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
-Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.codehaus.groovy;bundle-version="1.8.6",
+Require-Bundle: com.minres.scviewer.database,
+ org.codehaus.groovy;bundle-version="2.5.8",
  org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
diff --git a/com.minres.scviewer.database.text/pom.xml b/com.minres.scviewer.database.text/pom.xml
index aa0c0d0..759ac27 100644
--- a/com.minres.scviewer.database.text/pom.xml
+++ b/com.minres.scviewer.database.text/pom.xml
@@ -2,7 +2,7 @@
 	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>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
@@ -15,10 +15,13 @@
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-        		<version>0.23.1</version>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
 				<configuration>
 					<compilerId>groovy-eclipse-compiler</compilerId>
+			        <compilerArguments>
+			            <indy/><!-- optional; supported by batch 2.4.12-04+ -->
+			        </compilerArguments>
 					<!-- set verbose to be true if you want lots of uninteresting messages -->
 					<!-- <verbose>true</verbose> -->
 					<source>1.7</source>
@@ -34,8 +37,6 @@
 						<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>
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
index e2b2d42..8fa5b9b 100644
--- a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
+++ b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
@@ -116,7 +116,7 @@ public class TextDbLoader implements IWaveformDbLoader{
 		} catch (IOException e) {
 			return false;
 		} finally {
-			is.close()
+			if(is!=null) is.close()
 		}
 	}
 
diff --git a/com.minres.scviewer.database/META-INF/MANIFEST.MF b/com.minres.scviewer.database/META-INF/MANIFEST.MF
index c1ec1ec..9550f8c 100644
--- a/com.minres.scviewer.database/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database/META-INF/MANIFEST.MF
@@ -8,7 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.minres.scviewer.database
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml
-Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.4.200",
- org.eclipse.equinox.util;bundle-version="1.0.500",
- org.eclipse.osgi.services;bundle-version="3.4.0"
 Automatic-Module-Name: com.minres.scviewer.database
diff --git a/com.minres.scviewer.parent/pom.xml b/com.minres.scviewer.parent/pom.xml
index 13bb8f3..f7296c1 100644
--- a/com.minres.scviewer.parent/pom.xml
+++ b/com.minres.scviewer.parent/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
 	<groupId>com.minres.scviewer</groupId>
@@ -24,25 +25,10 @@
 	</modules>
 
 	<properties>
-		<tycho-version>0.23.1</tycho-version>
-		<tycho-extras-version>${tycho-version}</tycho-extras-version>
-		<groovy-eclipse-compiler-version>2.8.0-01</groovy-eclipse-compiler-version>
-		<!-- <groovy-eclipse-batch-version>2.0.5</groovy-eclipse-batch-version> -->
-		<groovy-eclipse-batch-version>2.1.8-01</groovy-eclipse-batch-version>
-
+		<tycho-version>1.5.0</tycho-version>
+		<groovy-eclipse-compiler-version>3.5.0</groovy-eclipse-compiler-version>
+		<groovy-eclipse-batch-version>2.5.8-03</groovy-eclipse-batch-version>
 	</properties>
-	<repositories>
-		<repository>
-			<id>mars</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/photon</url>
-		</repository>
-		<repository>
-			<id>GRECLIPSE</id>
-			<layout>p2</layout>
-			<url>http://dist.springsource.org/snapshot/GRECLIPSE/e4.8</url>
-		</repository>
-	</repositories>
 
 	<build>
 		<plugins>
@@ -53,11 +39,54 @@
 				<extensions>true</extensions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho-version}</version>
+			</plugin>
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
+					<target>
+						<artifact>
+							<groupId>com.minres.scviewer</groupId>
+							<artifactId>com.minres.scviewer.target</artifactId>
+							<version>2.0.0-SNAPSHOT</version>
+						</artifact>
+					</target>
 					<environments>
 						<environment>
 							<os>linux</os>
@@ -91,7 +120,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
+				<version>${tycho-version}</version>
 
 				<executions>
 					<execution>
@@ -111,41 +140,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attached-p2-metadata</id>
-						<phase>package</phase>
-						<goals>
-							<goal>p2-metadata</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-versions-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/com.minres.scviewer.target/photon.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
similarity index 83%
rename from com.minres.scviewer.target/photon.target
rename to com.minres.scviewer.target/com.minres.scviewer.target.target
index 5d6c71b..35d5d82 100644
--- a/com.minres.scviewer.target/photon.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Photon Platform" sequenceNumber="138">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="com.minres.scviewer.target" sequenceNumber="138">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,8 +13,9 @@
 <repository location="http://download.eclipse.org/releases/photon"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.codehaus.groovy24.feature.feature.group" version="0.0.0"/>
+<unit id="org.codehaus.groovy24.feature.feature.group" version="3.5.1.v201909291550-e48"/>
 <repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.8/"/>
+	<unit id="org.codehaus.groovy25.feature.feature.group" version="3.5.1.v201909291550-e48"/>
 </location>
 </locations>
 <environment>
diff --git a/com.minres.scviewer.target/pom.xml b/com.minres.scviewer.target/pom.xml
index 75a143f..459e328 100644
--- a/com.minres.scviewer.target/pom.xml
+++ b/com.minres.scviewer.target/pom.xml
@@ -4,7 +4,7 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>photon</artifactId>
+	<artifactId>com.minres.scviewer.target</artifactId>
 	
 	<packaging>eclipse-target-definition</packaging>
 	<name>SCViewer Target Definition</name>