From e2561ca6728ec1fd04ead35bb38e333aa4ec1a83 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch 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 @@ - - 4.0.0 - com.minres.scviewer.database.test - - src - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - - com.minres.scviewer - com.minres.scviewer.parent - 1.0.0-SNAPSHOT - ../com.minres.scviewer.parent - - eclipse-test-plugin + + 4.0.0 + com.minres.scviewer.database.test + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-test-plugin + + + + org.eclipse.tycho + tycho-surefire-plugin + + + + + p2-installable-unit + org.eclipse.equinox.ds + + + + + + \ 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 @@ - - 4.0.0 - com.minres.scviewer.database.text - - src - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - - com.minres.scviewer - com.minres.scviewer.parent - 1.0.0-SNAPSHOT - ../com.minres.scviewer.parent - - eclipse-plugin + + 4.0.0 + com.minres.scviewer.database.text + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-plugin + + + + org.eclipse.tycho + tycho-compiler-plugin + + groovy-eclipse-compiler + + + 1.7 + 1.7 + + + + org.codehaus.groovy + groovy-eclipse-compiler + ${groovy-eclipse-compiler-version} + + + org.codehaus.groovy + groovy-eclipse-batch + ${groovy-eclipse-batch-version} + + + + + + + \ 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 @@ 4.0.0 com.minres.scviewer.database.vcd - - src - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - com.minres.scviewer com.minres.scviewer.parent 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 @@ 4.0.0 com.minres.scviewer.database - - src - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - com.minres.scviewer com.minres.scviewer.parent 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 @@ 0.22.0 0.22.0 - UTF-8 + UTF-8 + 2.9.1-01 + 2.3.4-01 http://download.eclipse.org/releases/luna http://dist.springsource.org/release/GRECLIPSE/e4.4 https://oss.sonatype.org/content/groups/public/ + + + + + + + + + @@ -53,6 +64,7 @@ + src org.eclipse.tycho @@ -60,7 +72,6 @@ ${tycho.version} true - org.eclipse.tycho target-platform-configuration @@ -94,7 +105,6 @@ - org.eclipse.tycho tycho-source-plugin @@ -107,8 +117,15 @@ + + org.eclipse.tycho + tycho-compiler-plugin + + 1.7 + 1.7 + + - @@ -124,7 +141,7 @@ - ISO-8859-1 + UTF-8 @@ -139,14 +156,10 @@ ${tycho-extras.version} - + + org.eclipse.tycho tycho-surefire-plugin @@ -189,7 +202,10 @@ none - http://download.eclipse.org/eclipse/updates/4.4 + ${eclipse-repo.url} + + + ${groovy-repo.url} 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 @@ 4.0.0 com.minres.scviewer.ui - - src - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - com.minres.scviewer com.minres.scviewer.parent