Merge "Updated the mirrored services list to conform with new architecture." into develop
diff --git a/org.eclipse.app4mc.cloud.migration/migration-app/debug.bndrun b/org.eclipse.app4mc.cloud.migration/migration-app/debug.bndrun
index f024fe0..63b9e0d 100644
--- a/org.eclipse.app4mc.cloud.migration/migration-app/debug.bndrun
+++ b/org.eclipse.app4mc.cloud.migration/migration-app/debug.bndrun
@@ -1,6 +1,6 @@
--include: ~converter-app.bndrun
+-include: ~migration-app.bndrun
-test-index: target/test-index.xml;name="converter-app Test"
+test-index: target/test-index.xml;name="migration-app Test"
-standalone: ${index},${test-index}
diff --git a/org.eclipse.app4mc.cloud.migration/migration-app/migration-app.bndrun b/org.eclipse.app4mc.cloud.migration/migration-app/migration-app.bndrun
index 17f8486..dba15f7 100644
--- a/org.eclipse.app4mc.cloud.migration/migration-app/migration-app.bndrun
+++ b/org.eclipse.app4mc.cloud.migration/migration-app/migration-app.bndrun
@@ -1,4 +1,4 @@
-index: target/index.xml;name="converter-app"
+index: target/index.xml;name="migration-app"
-standalone: ${index}
@@ -46,7 +46,7 @@
org.apache.aries.jax.rs.whiteboard;version='[1.0.1,1.0.2)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.configurator;version='[1.0.6,1.0.7)',\
- org.apache.felix.http.jetty;version='[4.1.6,4.1.7)',\
+ org.apache.felix.http.jetty;version='[4.1.12,4.1.13)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
org.apache.servicemix.bundles.jdom;version='[2.0.6,2.0.7)',\
@@ -72,7 +72,7 @@
org.eclipse.app4mc.util.sessionlog;version='[1.1.0,1.1.1)',\
org.eclipse.app4mc.util.sessionlog.file;version='[1.1.0,1.1.1)',\
org.eclipse.equinox.common;version='[3.12.0,3.12.1)',\
- org.eclipse.osgi.services;version='[3.8.0,3.8.1)',\
- org.eclipse.osgi.util;version='[3.5.300,3.5.301)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)',\
slf4j.api;version='[1.7.25,1.7.26)'
\ No newline at end of file
diff --git a/org.eclipse.app4mc.cloud.migration/migration-service/pom.xml b/org.eclipse.app4mc.cloud.migration/migration-service/pom.xml
index 51f466c..0be83f7 100644
--- a/org.eclipse.app4mc.cloud.migration/migration-service/pom.xml
+++ b/org.eclipse.app4mc.cloud.migration/migration-service/pom.xml
@@ -165,15 +165,5 @@
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.12.0</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>3.8.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi.util</artifactId>
- <version>3.5.300</version>
- </dependency>
</dependencies>
</project>
diff --git a/org.eclipse.app4mc.cloud.migration/pom.xml b/org.eclipse.app4mc.cloud.migration/pom.xml
index d8b55cb..e6f44e1 100644
--- a/org.eclipse.app4mc.cloud.migration/pom.xml
+++ b/org.eclipse.app4mc.cloud.migration/pom.xml
@@ -14,7 +14,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bnd.version>5.2.0</bnd.version>
+ <bnd.version>5.3.0</bnd.version>
</properties>
<modules>
@@ -227,7 +227,7 @@
<dependency>
<artifactId>org.apache.felix.http.jetty</artifactId>
<groupId>org.apache.felix</groupId>
- <version>4.1.6</version>
+ <version>4.1.12</version>
</dependency>
</dependencies>
</dependencyManagement>
