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 @@
org.eclipse.tycho
tycho-surefire-plugin
- 0.23.1
+ ${tycho-version}
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">
4.0.0
com.minres.scviewer.database.text
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
com.minres.scviewer
com.minres.scviewer.parent
@@ -15,10 +15,13 @@
org.eclipse.tycho
- tycho-compiler-plugin
- 0.23.1
+ maven-compiler-plugin
+ 3.8.0
groovy-eclipse-compiler
+
+
+
@@ -34,8 +37,6 @@
org.codehaus.groovy
groovy-eclipse-batch
${groovy-eclipse-batch-version}
-
-
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 @@
-
4.0.0
com.minres.scviewer
@@ -24,25 +25,10 @@
- 0.23.1
- ${tycho-version}
- 2.8.0-01
-
- 2.1.8-01
-
+ 1.5.0
+ 3.5.0
+ 2.5.8-03
-
-
- mars
- p2
- http://download.eclipse.org/releases/photon
-
-
- GRECLIPSE
- p2
- http://dist.springsource.org/snapshot/GRECLIPSE/e4.8
-
-
@@ -53,11 +39,54 @@
true
+
+ org.eclipse.tycho
+ tycho-source-plugin
+ ${tycho-version}
+
+
+
+ plugin-source
+
+ plugin-source
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-plugin
+ ${tycho-version}
+
+
+ attach-p2-metadata
+ package
+
+ p2-metadata
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-versions-plugin
+ ${tycho-version}
+
+
org.eclipse.tycho
target-platform-configuration
${tycho-version}
+
+
+ com.minres.scviewer
+ com.minres.scviewer.target
+ 2.0.0-SNAPSHOT
+
+
linux
@@ -91,7 +120,7 @@
org.eclipse.tycho.extras
tycho-source-feature-plugin
- ${tycho-extras-version}
+ ${tycho-version}
@@ -111,41 +140,6 @@
-
- org.eclipse.tycho
- tycho-source-plugin
- ${tycho-version}
-
-
-
- plugin-source
-
- plugin-source
-
-
-
-
-
-
- org.eclipse.tycho
- tycho-p2-plugin
- ${tycho-version}
-
-
- attached-p2-metadata
- package
-
- p2-metadata
-
-
-
-
-
-
- org.eclipse.tycho
- tycho-versions-plugin
- ${tycho-version}
-
\ 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 @@
-
+
+
+
@@ -11,8 +13,9 @@
-
+
+
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">
4.0.0
- photon
+ com.minres.scviewer.target
eclipse-target-definition
SCViewer Target Definition