Fix integration tests for cytoscape 3.7

Author: mikekucera

EnrichmentMapIntegrationTest/pom.xml

@@ -14,11 +14,10 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<exam.version>3.5.0</exam.version>
-		<cy3.version>3.4.0</cy3.version>
-		<url.version>2.0.0</url.version>
-		<karaf.version>3.0.3</karaf.version>
-		<pax.exam.version>1.2.2</pax.exam.version>
+		<exam.version>4.12.0</exam.version>
+		<cy3.version>3.7.1-SNAPSHOT</cy3.version>
+		<url.version>2.5.4</url.version>
+		<karaf.version>4.2.1</karaf.version>
 	</properties>
 
 	<build>

EnrichmentMapIntegrationTest/src/test/java/org/baderlab/csplugins/enrichmentmap/integration/PaxExamConfiguration.java

@@ -1,6 +1,12 @@
 package org.baderlab.csplugins.enrichmentmap.integration;
 
-import static org.ops4j.pax.exam.CoreOptions.*;
+import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
 
 import org.ops4j.pax.exam.Configuration;
@@ -18,15 +24,16 @@ public abstract class PaxExamConfiguration {
 	public Option[] config() {
 
 		// These have to match what's in the pom.xml files.
-		final String cyVersion = "3.5.0"; 
-		final String emVersion = "3.2.0-SNAPSHOT";
+		final String cyVersion = "3.7.1-SNAPSHOT"; 
+		final String emVersion = "3.2.0-BETA1";
+		final String karafVersion = "4.2.1";
 		final String groupId   = "org.baderlab.csplugins";
 		final String appBundle = "EnrichmentMap";
 
 		return options(
 			karafDistributionConfiguration()
-		       	.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip").versionAsInProject())
-	            .karafVersion("3.0.2").name("Apache Karaf").useDeployFolder(false),
+		       	.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip").version(karafVersion))
+	            .karafVersion(karafVersion).name("Apache Karaf").useDeployFolder(false),
 			systemProperty("org.osgi.framework.system.packages.extra").value("com.sun.xml.internal.bind"),
 			junitBundles(),
 			vmOption("-Xmx512M"),
@@ -59,6 +66,7 @@ public Option[] config() {
 			mavenBundle().groupId("org.cytoscape").artifactId("datasource-impl").version(cyVersion).startLevel(9),
 			mavenBundle().groupId("org.cytoscape").artifactId("equations-impl").version(cyVersion).startLevel(9),
 			mavenBundle().groupId("org.cytoscape").artifactId("event-impl").version(cyVersion).startLevel(9),
+			mavenBundle().groupId("org.cytoscape").artifactId("util-impl").version(cyVersion).startLevel(9),
 			mavenBundle().groupId("org.cytoscape").artifactId("model-impl").version(cyVersion).startLevel(11),
 			mavenBundle().groupId("org.cytoscape").artifactId("work-impl").version(cyVersion).startLevel(11),
 			mavenBundle().groupId("org.cytoscape").artifactId("work-headless-impl").version(cyVersion).startLevel(11),