[MAINTENANCE] Extract dependency versions to properties - subsystem

Author: alien11689

subsystem/subsystem-api/pom.xml

@@ -49,33 +49,38 @@
             org.osgi.service.subsystem
         </aries.osgi.export.pkg>
         <aries.osgi.import>
-    		org.osgi.service.repository;version="[1.0,1.1)",
-    		org.osgi.service.subsystem;version="[1.1,1.2)",
-    		*
-    	</aries.osgi.import>
+            org.osgi.service.repository;version="[1.0,1.1)",
+            org.osgi.service.subsystem;version="[1.1,1.2)",
+            *
+        </aries.osgi.import>
+
+        <org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
+        <org.osgi.annotation.version>6.0.0</org.osgi.annotation.version>
+        <org.osgi.core.version>6.0.0</org.osgi.core.version>
+        <org.osgi.enterprise.version>5.0.0</org.osgi.enterprise.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>1.1.1</version>
+            <version>${org.apache.aries.util.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>6.0.0</version>
+            <version>${org.osgi.core.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.annotation</artifactId>
-            <version>6.0.0</version>
+            <version>${org.osgi.annotation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.enterprise</artifactId>
-            <version>5.0.0</version>
+            <version>${org.osgi.enterprise.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

subsystem/subsystem-bundle/pom.xml

@@ -45,7 +45,7 @@
         <aries.osgi.activator>
             org.apache.aries.subsystem.core.internal.Activator
         </aries.osgi.activator>
-    	<aries.osgi.import>
+        <aries.osgi.import>
             org.osgi.service.repository;version="[1.0,1.1)",
             org.osgi.service.subsystem;version="[1.1,1.2)",
             org.apache.aries.application.*;resolution:=optional,
@@ -60,68 +60,81 @@
             org.apache.aries.subsystem.*
         </aries.osgi.private.pkg>
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
+
+        <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
+        <org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version>
+        <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
+        <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version>
+        <org.apache.aries.proxy.version>1.0.1</org.apache.aries.proxy.version>
+        <org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version>
+        <org.apache.aries.subsystem.core.version>2.0.10</org.apache.aries.subsystem.core.version>
+        <org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
+        <org.apache.felix.resolver.version>1.0.0</org.apache.felix.resolver.version>
+        <org.eclipse.equinox.coordinator.version>1.1.0.v20120522-1841</org.eclipse.equinox.coordinator.version>
+        <org.eclipse.equinox.region.version>1.2.101.v20150831-1342</org.eclipse.equinox.region.version>
+        <org.eclipse.osgi.version>3.10.0.v20140606-1445</org.eclipse.osgi.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.api</artifactId>
-            <version>2.0.10</version>
+            <version>${org.apache.aries.subsystem.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.core</artifactId>
-            <version>2.0.10</version>
+            <version>${org.apache.aries.subsystem.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>1.1.1</version>
+            <version>${org.apache.aries.util.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.api</artifactId>
-            <version>1.0.0</version>
+            <version>${org.apache.aries.application.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.modeller</artifactId>
-            <version>1.0.0</version>
+            <version>${org.apache.aries.application.modeller.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.utils</artifactId>
-            <version>1.0.0</version>
+            <version>${org.apache.aries.application.utils.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
-            <version>1.0.0</version>
+            <version>${org.apache.aries.blueprint.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
-            <version>1.0.1</version>
+            <version>${org.apache.aries.proxy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.resolver</artifactId>
-            <version>1.0.0</version>
+            <version>${org.apache.felix.resolver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>org.eclipse.equinox.coordinator</artifactId>
-            <version>1.1.0.v20120522-1841</version>
+            <version>${org.eclipse.equinox.coordinator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>org.eclipse.equinox.region</artifactId>
-            <version>1.2.101.v20150831-1342</version>
+            <version>${org.eclipse.equinox.region.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.tycho</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.10.0.v20140606-1445</version>
+            <version>${org.eclipse.osgi.version}</version>
         </dependency>
     </dependencies>
 

subsystem/subsystem-core/pom.xml

@@ -45,75 +45,87 @@
         <aries.osgi.activator>
             org.apache.aries.subsystem.core.internal.Activator
         </aries.osgi.activator>
-    	<aries.osgi.import>
+        <aries.osgi.import>
             org.osgi.service.subsystem;version="[1.1,1.2)",
             org.apache.aries.subsystem;version="[1.2,1.3)",
             org.apache.aries.application.*;resolution:=optional,
             *
         </aries.osgi.import>
-        <aries.osgi.export.pkg />
+        <aries.osgi.export.pkg/>
         <aries.osgi.private.pkg>
             org.apache.aries.subsystem.core.*
         </aries.osgi.private.pkg>
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
         <aries.osgi.provide.capability>
-        	osgi.implementation;
-    			osgi.implementation="osgi.subsystem";
-    			version:Version="1.1";
-    			uses:="org.osgi.service.subsystem",
-    		osgi.service;
-    			objectClass:List&lt;String&gt;="org.osgi.service.subsystem.Subsystem,org.apache.aries.subsystem.AriesSubsystem";
-    			uses:="org.osgi.service.subsystem,org.apache.aries.subsystem"
+            osgi.implementation;
+            osgi.implementation="osgi.subsystem";
+            version:Version="1.1";
+            uses:="org.osgi.service.subsystem",
+            osgi.service;
+            objectClass:List&lt;String&gt;="org.osgi.service.subsystem.Subsystem,org.apache.aries.subsystem.AriesSubsystem";
+            uses:="org.osgi.service.subsystem,org.apache.aries.subsystem"
         </aries.osgi.provide.capability>
+
+
+        <org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version>
+        <org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
+        <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
+        <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
+        <org.osgi.core.version>6.0.0</org.osgi.core.version>
+        <org.osgi.enterprise.version>5.0.0</org.osgi.enterprise.version>
+        <org.eclipse.equinox.coordinator.version>1.1.0.v20120522-1841</org.eclipse.equinox.coordinator.version>
+        <org.eclipse.equinox.region.version>1.2.101.v20150831-1342</org.eclipse.equinox.region.version>
+        <easymock.version>3.0</easymock.version>
+        <maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.api</artifactId>
-            <version>2.0.10</version>
+            <version>${org.apache.aries.subsystem.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>1.1.1</version>
+            <version>${org.apache.aries.util.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.api</artifactId>
-            <version>1.0.0</version>
+            <version>${org.apache.aries.application.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.utils</artifactId>
-            <version>1.0.0</version>
+            <version>${org.apache.aries.application.utils.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>6.0.0</version>
+            <version>${org.osgi.core.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.enterprise</artifactId>
-            <version>5.0.0</version>
+            <version>${org.osgi.enterprise.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>org.eclipse.equinox.coordinator</artifactId>
-            <version>1.1.0.v20120522-1841</version>
+            <version>${org.eclipse.equinox.coordinator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>org.eclipse.equinox.region</artifactId>
-            <version>1.2.101.v20150831-1342</version>
+            <version>${org.eclipse.equinox.region.version}</version>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>3.0</version>
+            <version>${easymock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -150,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.0</version>
+                <version>${maven-bundle-plugin.version}</version>
                 <extensions>true</extensions>
                 <inherited>true</inherited>
                 <configuration>

subsystem/subsystem-example/subsystem-helloIsolation/pom.xml

@@ -17,14 +17,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>1.0.1-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
-    </parent>  
+    </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
     <artifactId>org.apache.aries.subsystem.example.helloIsolation</artifactId>

subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml

@@ -17,14 +17,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>1.0.1-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
-    </parent>  
+    </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
     <artifactId>org.apache.aries.subsystem.example.helloIsolationRef</artifactId>

subsystem/subsystem-executor/pom.xml

@@ -17,7 +17,7 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
@@ -32,7 +32,7 @@
     <name>Apache Aries Subsystem Executor</name>
     <version>0.1-SNAPSHOT</version>
     <description>
-      Subsystem Executor used for async SubsystemAdmin operations.  Can be replaced by runtimes integrating the Subsystem support.
+        Subsystem Executor used for async SubsystemAdmin operations. Can be replaced by runtimes integrating the Subsystem support.
     </description>
 
     <scm>