Merge pull request #760 from amitjoy/refactoring

Refactoring

cnf/maven/build.maven

@@ -1,5 +1,5 @@
 # Google
-com.google.mug:mug:8.0
+com.google.mug:mug:8.1
 
 # bnd
 biz.aQute.bnd:biz.aQute.bnd.util:6.4.1

cnf/maven/runtime.maven

@@ -22,7 +22,7 @@ org.apache.felix:org.apache.felix.dependencymanager:4.6.1
 org.apache.felix:org.apache.felix.deploymentadmin:0.9.10
 org.apache.felix:org.apache.felix.eventadmin:1.6.4
 org.apache.felix:org.apache.felix.metatype:1.2.4
-org.apache.felix:org.apache.felix.scr:2.2.10
+org.apache.felix:org.apache.felix.scr:2.2.12
 
 # OSGi Core Services
 org.osgi:org.osgi.service.component:1.5.1
@@ -32,7 +32,7 @@ org.osgi:org.osgi.util.promise:1.3.0
 org.osgi:org.osgi.util.pushstream:1.1.0
 
 # Equinox (OSGi)
-org.eclipse.platform:org.eclipse.equinox.app:1.7.0
+org.eclipse.platform:org.eclipse.equinox.app:1.7.200
 org.eclipse.platform:org.eclipse.equinox.bidi:1.5.0
 org.eclipse.platform:org.eclipse.equinox.common:3.19.0
 org.eclipse.platform:org.eclipse.equinox.concurrent:1.3.0
@@ -46,15 +46,15 @@ org.eclipse.platform:org.eclipse.equinox.launcher.gtk.linux.x86_64:1.2.900
 org.eclipse.platform:org.eclipse.equinox.launcher.win32.win32.x86_64:1.2.900
 org.eclipse.platform:org.eclipse.equinox.preferences:3.11.0
 org.eclipse.platform:org.eclipse.equinox.registry:3.12.0
-org.eclipse.platform:org.eclipse.osgi:3.19.0
+org.eclipse.platform:org.eclipse.osgi:3.21.0
 org.eclipse.platform:org.eclipse.osgi.services:3.12.0
 
 # Eclipse e4
 org.eclipse.platform:org.eclipse.e4.core.commands:1.1.300
 org.eclipse.platform:org.eclipse.e4.core.contexts:1.12.500
-org.eclipse.platform:org.eclipse.e4.core.di:1.9.300
-org.eclipse.platform:org.eclipse.e4.core.di.annotations:1.8.300
-org.eclipse.platform:org.eclipse.e4.core.di.extensions:0.18.200
+org.eclipse.platform:org.eclipse.e4.core.di:1.9.500
+org.eclipse.platform:org.eclipse.e4.core.di.annotations:1.8.400
+org.eclipse.platform:org.eclipse.e4.core.di.extensions:0.18.300
 org.eclipse.platform:org.eclipse.e4.core.di.extensions.supplier:0.17.400
 org.eclipse.platform:org.eclipse.e4.core.services:2.4.300
 org.eclipse.platform:org.eclipse.e4.emf.xpath:0.4.200
@@ -74,9 +74,9 @@ org.eclipse.platform:org.eclipse.core.filebuffers:3.8.300
 org.eclipse.platform:org.eclipse.core.filesystem:1.10.300
 org.eclipse.platform:org.eclipse.core.jobs:3.15.200
 org.eclipse.platform:org.eclipse.core.net:1.5.300
-org.eclipse.platform:org.eclipse.core.resources:3.20.100
-org.eclipse.platform:org.eclipse.core.runtime:3.31.0
-org.eclipse.platform:org.eclipse.core.variables:3.6.300
+org.eclipse.platform:org.eclipse.core.resources:3.21.0
+org.eclipse.platform:org.eclipse.core.runtime:3.31.100
+org.eclipse.platform:org.eclipse.core.variables:3.6.500
 
 # OSGi Logging
 org.apache.sling:org.apache.sling.commons.log:5.5.0

com.osgifx.console.product/osgifx.bndrun

@@ -158,7 +158,7 @@ install.order                     :   \
 	org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)';startlevel=10,\
 	org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)';startlevel=10,\
 	org.apache.felix.metatype;version='[1.2.4,1.2.5)';startlevel=10,\
-	org.apache.felix.scr;version='[2.2.10,2.2.11)';startlevel=10,\
+	org.apache.felix.scr;version='[2.2.12,2.2.13)';startlevel=10,\
 	org.apache.sling.commons.log;version='[5.5.0,5.5.1)';startlevel=10,\
 	org.apache.sling.commons.logservice;version='[1.1.0,1.1.1)';startlevel=10,\
 	org.eclipse.core.commands;version='[3.12.0,3.12.1)';startlevel=10,\
@@ -167,7 +167,7 @@ install.order                     :   \
 	org.eclipse.core.databinding.property;version='[1.10.200,1.10.201)';startlevel=10,\
 	org.eclipse.core.expressions;version='[3.8.200,3.8.201)';startlevel=10,\
 	org.eclipse.core.jobs;version='[3.15.200,3.15.201)';startlevel=10,\
-	org.eclipse.core.runtime;version='[3.31.0,3.31.1)';startlevel=10,\
+	org.eclipse.core.runtime;version='[3.31.100,3.31.101)';startlevel=10,\
 	org.eclipse.e4.core.commands;version='[1.0.200,1.0.201)';startlevel=10,\
 	org.eclipse.e4.core.contexts;version='[1.11.0,1.11.1)';startlevel=10,\
 	org.eclipse.e4.core.di;version='[1.8.300,1.8.301)';startlevel=10,\
@@ -184,7 +184,7 @@ install.order                     :   \
 	org.eclipse.emf.ecore;version='[2.28.0,2.28.1)';startlevel=10,\
 	org.eclipse.emf.ecore.change;version='[2.14.0,2.14.1)';startlevel=10,\
 	org.eclipse.emf.ecore.xmi;version='[2.17.0,2.17.1)';startlevel=10,\
-	org.eclipse.equinox.app;version='[1.7.0,1.7.1)';startlevel=10,\
+	org.eclipse.equinox.app;version='[1.7.200,1.7.201)';startlevel=10,\
 	org.eclipse.equinox.common;version='[3.19.0,3.19.1)';startlevel=10,\
 	org.eclipse.equinox.event;version='[1.7.0,1.7.1)';startlevel=10,\
 	org.eclipse.equinox.preferences;version='[3.11.0,3.11.1)';startlevel=10,\