[MAINTENANCE] Remove unnecessary dependencies and rename properties

samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml

@@ -76,7 +76,7 @@
             <plugin>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>eba-maven-plugin</artifactId>
-                <version>${ariesEbaMavenPluginVersion}</version>
+                <version>${eba-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <generateManifest>true</generateManifest>

samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml

@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>eba-maven-plugin</artifactId>
-                <version>${ariesEbaMavenPluginVersion}</version>
+                <version>${eba-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <generateManifest>true</generateManifest>

samples/ariestrader/assemblies/equinox-test-harness/pom.xml

@@ -31,9 +31,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <cm.version>3.2.0-v20070116</cm.version>
         <osgi.version>3.5.0.v20090520</osgi.version>
-        <services.version>3.1.200-v20070605</services.version>
     </properties>
 
     <dependencies>

samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini

@@ -16,48 +16,48 @@
 # under the License.
 
 osgi.bundles=\
-cm-${cmVersion}.jar@start,\
-services-${servicesVersion}.jar@start,\
-asm-all-${asmVersion}.jar@start,\
+cm-${cm.version}.jar@start,\
+services-${services.version}.jar@start,\
+asm-all-${asm-all.version}.jar@start,\
 pax-logging-api-${pax-logging.version}.jar@start,\
 pax-logging-service-${pax-logging.version}.jar@start,\
-derby-${derbyVersion}.jar@start,\
-commons-collections-${commonsCollectionsVersion}.jar@start,\
-commons-lang-${commonsLangVersion}.jar@start,\
-commons-pool-${commonsPoolVersion}.jar@start,\
-org.apache.servicemix.bundles.serp-${servicemixBundlesSerpVersion}.jar@start,\
-openjpa-${openjpaVersion}.jar@start,\
-geronimo-j2ee-connector_1.5_spec-${geronimoJ2eeConnector15SpecVersion}.jar@start,\
-geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
-geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
-geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
-geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
-pax-web-jetty-bundle-${paxWebJettyBundleVersion}.jar@start,\
-pax-web-extender-war-${paxWebExtenderWarVersion}.jar@start,\
-pax-web-jsp-${paxWebJspVersion}.jar@start,\
-org.apache.felix.fileinstall-${felixFileinstallVersion}.jar@start,\
-org.apache.felix.bundlerepository-${felixBundleRepositoryVersion}.jar@start,\
-org.apache.aries.application.install-${ariesApplicationInstallVersion}.jar@start,\
-org.apache.aries.application.management-${ariesApplicationManagementVersion}.jar@start,\
-org.apache.aries.application.api-${ariesApplicationApiVersion}.jar@start,\
-org.apache.aries.application.utils-${ariesApplicationUtilsVersion}.jar@start,\
-org.apache.aries.application.runtime-${ariesApplicationRuntimeVersion}.jar@start,\
-org.apache.aries.application.deployment.management-${ariesApplicationDeploymentManagementVersion}.jar@start,\
-org.apache.aries.application.modeller-${ariesApplicationModellerVersion}.jar@start,\
-org.apache.aries.application.resolver.obr-${ariesApplicationObrResolverVersion}.jar@start,\
-org.apache.aries.application.resolver.noop-${ariesApplicationNoopResolverVersion}.jar@start,\
-org.apache.aries.application.default.local.platform-${ariesApplicationDefaultLocalPlatformVersion}.jar@start,\
-org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
-org.apache.aries.jpa.api-${ariesJpaApiVersion}.jar@start,\
-org.apache.aries.jpa.blueprint.aries-${ariesJpaBlueprintAriesVersion}.jar@start,\
-org.apache.aries.jpa.container-${ariesJpaContainerVersion}.jar@start,\
-org.apache.aries.jpa.container.context-${ariesJpaContainerContextVersion}.jar@start,\
-org.apache.aries.util-${ariesUtilVersion}.jar@start,\
-org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
-org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
-org.apache.aries.transaction.blueprint-${ariesTransactionBlueprintVersion}.jar@start,\
-org.apache.aries.transaction.manager-${ariesTransactionManagerVersion}.jar@start,\
-org.apache.aries.transaction.wrappers-${ariesTransactionWrappersVersion}.jar@start,\
+derby-${derby.version}.jar@start,\
+commons-collections-${commons-collections.version}.jar@start,\
+commons-lang-${commons-lang.version}.jar@start,\
+commons-pool-${commons-pool.version}.jar@start,\
+org.apache.servicemix.bundles.serp-${org.apache.servicemix.bundles.serp.version}.jar@start,\
+openjpa-${openjpa.version}.jar@start,\
+geronimo-j2ee-connector_1.5_spec-${geronimo-j2ee-connector_1.5_spec.version}.jar@start,\
+geronimo-jpa_2.0_spec-${geronimo-jpa_2.0_spec.version}.jar@start,\
+geronimo-jta_1.1_spec-${geronimo-jta_1.1_spec.version}.jar@start,\
+geronimo-transaction-${geronimo-transaction.version}.jar@start,\
+geronimo-servlet_2.5_spec-${geronimo-servlet_2.5_spec.version}.jar@start,\
+pax-web-jetty-bundle-${pax-web.version}.jar@start,\
+pax-web-extender-war-${pax-web.version}.jar@start,\
+pax-web-jsp-${pax-web.version}.jar@start,\
+org.apache.felix.fileinstall-${org.apache.felix.fileinstall.version}.jar@start,\
+org.apache.felix.bundlerepository-${org.apache.felix.bundlerepository.version}.jar@start,\
+org.apache.aries.application.install-${org.apache.aries.application.install.version}.jar@start,\
+org.apache.aries.application.management-${org.apache.aries.application.management.version}.jar@start,\
+org.apache.aries.application.api-${org.apache.aries.application.api.version}.jar@start,\
+org.apache.aries.application.utils-${org.apache.aries.application.utils.version}.jar@start,\
+org.apache.aries.application.runtime-${org.apache.aries.application.runtime.version}.jar@start,\
+org.apache.aries.application.deployment.management-${org.apache.aries.application.deployment.management.version}.jar@start,\
+org.apache.aries.application.modeller-${org.apache.aries.application.modeller.version}.jar@start,\
+org.apache.aries.application.resolver.obr-${org.apache.aries.application.resolver.obr.version}.jar@start,\
+org.apache.aries.application.resolver.noop-${org.apache.aries.application.resolver.noop.version}.jar@start,\
+org.apache.aries.application.default.local.platform-${org.apache.aries.application.default.local.platform.version}.jar@start,\
+org.apache.aries.jndi-${org.apache.aries.jndi.version}.jar@start,\
+org.apache.aries.jpa.api-${org.apache.aries.jpa.api.version}.jar@start,\
+org.apache.aries.jpa.blueprint.aries-${org.apache.aries.jpa.blueprint.aries.version}.jar@start,\
+org.apache.aries.jpa.container-${org.apache.aries.jpa.container.version}.jar@start,\
+org.apache.aries.jpa.container.context-${org.apache.aries.jpa.container.context.version}.jar@start,\
+org.apache.aries.util-${org.apache.aries.util.version}.jar@start,\
+org.apache.aries.blueprint-${org.apache.aries.blueprint.version}.jar@start,\
+org.apache.aries.proxy-${org.apache.aries.proxy.version}.jar@start,\
+org.apache.aries.transaction.blueprint-${org.apache.aries.transaction.blueprint.version}.jar@start,\
+org.apache.aries.transaction.manager-${org.apache.aries.transaction.manager.version}.jar@start,\
+org.apache.aries.transaction.wrappers-${org.apache.aries.transaction.wrappers.version}.jar@start,\
 org.apache.aries.samples.ariestrader.derby.ds-${project.version}.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG

samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini

@@ -16,49 +16,49 @@
 # under the License.
 
 osgi.bundles=\
-cm-${cmVersion}@start,\
-services-${servicesVersion}.jar@start,\
-asm-all-${asmVersion}.jar@start,\
+cm-${cm.version}@start,\
+services-${services.version}.jar@start,\
+asm-all-${asm-all.version}.jar@start,\
 pax-logging-api-${pax-logging.version}.jar@start,\
 pax-logging-service-${pax-logging.version}.jar@start,\
-derby-${derbyVersion}.jar@start,\
-pax-web-jetty-bundle-${paxWebJettyBundleVersion}.jar@start,\
-pax-web-extender-war-${paxWebExtenderWarVersion}.jar@start,\
-pax-web-jsp-${paxWebJspVersion}.jar@start,\
-org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
-org.apache.aries.util-${ariesUtilVersion}.jar@start,\
-org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
-org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
-org.apache.aries.application.install-${ariesApplicationInstallVersion}.jar@start,\
-org.apache.aries.application.management-${ariesApplicationManagementVersion}.jar@start,\
-org.apache.aries.application.api-${ariesApplicationApiVersion}.jar@start,\
-org.apache.aries.application.utils-${ariesApplicationUtilsVersion}.jar@start,\
-org.apache.aries.application.deployment.management-${ariesApplicationDeploymentManagementVersion}.jar@start,\
-org.apache.aries.application.modeller-${ariesApplicationModellerVersion}.jar@start,\
-org.apache.aries.application.resolver.obr-${ariesApplicationObrResolverVersion}.jar@start,\
-org.apache.aries.application.resolver.noop-${ariesApplicationNoopResolverVersion}.jar@start,\
-org.apache.aries.application.default.local.platform-${ariesApplicationDefaultLocalPlatformVersion}.jar@start,\
-org.apache.aries.application.runtime-${ariesApplicationRuntimeVersion}.jar@start,\
-org.apache.felix.fileinstall-${felixFileinstallVersion}.jar@start,\
-org.apache.felix.bundlerepository-${felixBundlerepositoryVersion}.jar@start,\
-commons-collections-${commonsCollectionsVersion}.jar@start,\
-commons-lang-${commonsLangVersion}.jar@start,\
-commons-pool-${commonsPoolVersion}.jar@start,\
-geronimo-j2ee-connector_1.5_spec-${geronimoJ2eeConnector15SpecVersion}.jar@start,\
-geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
-geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
-geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
-geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
-openjpa-${openjpaVersion}.jar@start,\
-org.apache.aries.jpa.api-${ariesJpaApiVersion}.jar@start,\
-org.apache.aries.jpa.blueprint.aries-${ariesJpaBlueprintAriesVersion}.jar@start,\
-org.apache.aries.jpa.container-${ariesJpaContainerVersion}.jar@start,\
-org.apache.aries.jpa.container.context-${ariesJpaContainerContextVersion}.jar@start,\
-org.apache.aries.transaction.blueprint-${ariesTransactionBlueprintVersion}.jar@start,\
-org.apache.aries.transaction.manager-${ariesTransactionManagerVersion}.jar@start,\
-org.apache.servicemix.bundles.serp-${servicemixBundlesSerpVersion}.jar@start,\
+derby-${derby.version}.jar@start,\
+pax-web-jetty-bundle-${pax-web.version}.jar@start,\
+pax-web-extender-war-${pax-web.version}.jar@start,\
+pax-web-jsp-${pax-web.version}.jar@start,\
+org.apache.aries.jndi-${org.apache.aries.jndi.version}.jar@start,\
+org.apache.aries.util-${org.apache.aries.util.version}.jar@start,\
+org.apache.aries.blueprint-${org.apache.aries.blueprint.version}.jar@start,\
+org.apache.aries.proxy-${org.apache.aries.proxy.version}.jar@start,\
+org.apache.aries.application.install-${org.apache.aries.application.install.version}.jar@start,\
+org.apache.aries.application.management-${org.apache.aries.application.management.version}.jar@start,\
+org.apache.aries.application.api-${org.apache.aries.application.api.version}.jar@start,\
+org.apache.aries.application.utils-${org.apache.aries.application.utils.version}.jar@start,\
+org.apache.aries.application.deployment.management-${org.apache.aries.application.deployment.management.version}.jar@start,\
+org.apache.aries.application.modeller-${org.apache.aries.application.modeller.version}.jar@start,\
+org.apache.aries.application.resolver.obr-${org.apache.aries.application.resolver.obr.version}.jar@start,\
+org.apache.aries.application.resolver.noop-${org.apache.aries.application.resolver.noop.version}.jar@start,\
+org.apache.aries.application.default.local.platform-${org.apache.aries.application.default.local.platform.version}.jar@start,\
+org.apache.aries.application.runtime-${org.apache.aries.application.runtime.version}.jar@start,\
+org.apache.felix.fileinstall-${org.apache.felix.fileinstall.version}.jar@start,\
+org.apache.felix.bundlerepository-${org.apache.felix.bundlerepository.version}.jar@start,\
+commons-collections-${commons-collections.version}.jar@start,\
+commons-lang-${commons-lang.version}.jar@start,\
+commons-pool-${commons-pool.version}.jar@start,\
+geronimo-j2ee-connector_1.5_spec-${geronimo-j2ee-connector_1.5_spec.version}.jar@start,\
+geronimo-jpa_2.0_spec-${geronimo-jpa_2.0_spec.version}.jar@start,\
+geronimo-jta_1.1_spec-${geronimo-jta_1.1_spec.version}.jar@start,\
+geronimo-transaction-${geronimo-transaction.version}.jar@start,\
+geronimo-servlet_2.5_spec-${geronimo-servlet_2.5_spec.version}.jar@start,\
+openjpa-${openjpa.version}.jar@start,\
+org.apache.aries.jpa.api-${org.apache.aries.jpa.api.version}.jar@start,\
+org.apache.aries.jpa.blueprint.aries-${org.apache.aries.jpa.blueprint.aries.version}.jar@start,\
+org.apache.aries.jpa.container-${org.apache.aries.jpa.container.version}.jar@start,\
+org.apache.aries.jpa.container.context-${org.apache.aries.jpa.container.context.version}.jar@start,\
+org.apache.aries.transaction.blueprint-${org.apache.aries.transaction.blueprint.version}.jar@start,\
+org.apache.aries.transaction.manager-${org.apache.aries.transaction.manager.version}.jar@start,\
+org.apache.servicemix.bundles.serp-${org.apache.servicemix.bundles.serp.version}.jar@start,\
 org.apache.aries.samples.blog.datasource-${project.version}.jar@start,\
-org.apache.aries.transaction.wrappers-${ariesTransactionWrappersVersion}.jar@start
+org.apache.aries.transaction.wrappers-${org.apache.aries.transaction.wrappers.version}.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=INFO
 org.osgi.framework.system.packages=\

samples/blog/blog-jdbc-eba/pom.xml

@@ -63,7 +63,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>eba-maven-plugin</artifactId>
-                <version>${ariesEbaMavenPluginVersion}</version>
+                <version>${eba-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <generateManifest>true</generateManifest>

samples/blog/blog-jpa-eba/pom.xml

@@ -63,7 +63,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>eba-maven-plugin</artifactId>
-                <version>${ariesEbaMavenPluginVersion}</version>
+                <version>${eba-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <generateManifest>true</generateManifest>

samples/blog/blog-web/pom.xml

@@ -53,7 +53,7 @@
                         <Private-Package>org.apache.aries.samples.blog.web.*</Private-Package>
                         <Export-Package>!org.apache.aries.samples.blog.web.*</Export-Package>
                         <Import-Package>
-                            javax.servlet*;version=${javaxServletVersion},
+                            javax.servlet*;version=${javax-servlet.version},
                             *
                         </Import-Package>
                         <!-- Sets Bundle-Classpath to WEB-INF/classes -->

samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini

@@ -16,14 +16,14 @@
 # under the License.
 
 osgi.bundles=\
-cm-${cmVersion}@start,\
-services-${servicesVersion}@start,\
+cm-${cm.version}@start,\
+services-${services.version}@start,\
 pax-logging-api-${pax-logging.version}.jar@start,\
 pax-logging-service-${pax-logging.version}.jar@start,\
-asm-all-${asmVersion}.jar@start,\
-org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
-org.apache.aries.util-${ariesUtilVersion}.jar@start,\
-org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
+asm-all-${asm-all.version}.jar@start,\
+org.apache.aries.proxy-${org.apache.aries.proxy.version}.jar@start,\
+org.apache.aries.util-${org.apache.aries.util.version}.jar@start,\
+org.apache.aries.blueprint-${org.apache.aries.blueprint.version}.jar@start,\
 org.apache.aries.samples.blueprint.helloworld.api-${project.version}.jar@1,\
 org.apache.aries.samples.blueprint.helloworld.server-${project.version}.jar@1,\
 org.apache.aries.samples.blueprint.helloworld.client-${project.version}.jar@1

samples/blueprint/helloworld/helloworld-eba/pom.xml

@@ -55,7 +55,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>eba-maven-plugin</artifactId>
-                <version>${ariesEbaMavenPluginVersion}</version>
+                <version>${eba-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <generateManifest>true</generateManifest>