This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7a5a3fd8c [MAINTENANCE] Remove unnecessary dependencies and rename
properties
7a5a3fd8c is described below
commit 7a5a3fd8c82e68138b88bacc5691d342206cfb28
Author: Dominik Przybysz <[email protected]>
AuthorDate: Tue Feb 25 12:04:54 2025 +0100
[MAINTENANCE] Remove unnecessary dependencies and rename properties
---
.../assemblies/ariestrader-all-eba/pom.xml | 2 +-
.../assemblies/ariestrader-jdbc-eba/pom.xml | 2 +-
.../assemblies/equinox-test-harness/pom.xml | 2 -
.../filtered-resources/configuration/config.ini | 80 ++---
.../filtered-resources/configuration/config.ini | 80 ++---
samples/blog/blog-jdbc-eba/pom.xml | 2 +-
samples/blog/blog-jpa-eba/pom.xml | 2 +-
samples/blog/blog-web/pom.xml | 2 +-
.../filtered-resources/configuration/config.ini | 12 +-
.../blueprint/helloworld/helloworld-eba/pom.xml | 2 +-
samples/pom.xml | 366 ++++++---------------
samples/twitter/pom.xml | 1 -
samples/twitter/twitter-eba/pom.xml | 2 +-
samples/twitter/twitter-itests/pom.xml | 19 +-
.../obr/twitter/TwitterRepository.xml | 72 ++--
.../aries/sample/twitter/itest/TwitterTest.java | 3 -
16 files changed, 239 insertions(+), 410 deletions(-)
diff --git a/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
b/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
index 714185413..75303f79f 100644
--- a/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
+++ b/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>
diff --git a/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
b/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
index 7e085044d..a1447ba77 100644
--- a/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
+++ b/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>
diff --git a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
index 7c4479b50..c126f97a1 100644
--- a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
+++ b/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>
diff --git
a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
index cc7c3054e..394bdb244 100644
---
a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
+++
b/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
diff --git
a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
index 18326904e..a96fac2b8 100644
---
a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
+++
b/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=\
diff --git a/samples/blog/blog-jdbc-eba/pom.xml
b/samples/blog/blog-jdbc-eba/pom.xml
index 0f44a3715..ea0fed7af 100644
--- a/samples/blog/blog-jdbc-eba/pom.xml
+++ b/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>
diff --git a/samples/blog/blog-jpa-eba/pom.xml
b/samples/blog/blog-jpa-eba/pom.xml
index 92b10516c..4c4d45bb0 100644
--- a/samples/blog/blog-jpa-eba/pom.xml
+++ b/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>
diff --git a/samples/blog/blog-web/pom.xml b/samples/blog/blog-web/pom.xml
index ed5b4ec43..7e20cab47 100644
--- a/samples/blog/blog-web/pom.xml
+++ b/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 -->
diff --git
a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
index 1b97b3174..326c1171e 100644
---
a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
+++
b/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
diff --git a/samples/blueprint/helloworld/helloworld-eba/pom.xml
b/samples/blueprint/helloworld/helloworld-eba/pom.xml
index a1c6a1671..a9eea1a31 100644
--- a/samples/blueprint/helloworld/helloworld-eba/pom.xml
+++ b/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>
diff --git a/samples/pom.xml b/samples/pom.xml
index bfcb5158a..5542eac50 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -47,111 +47,76 @@
<properties>
<!-- Aries eba-maven-plugin Version -->
- <ariesEbaMavenPluginVersion>1.0.0</ariesEbaMavenPluginVersion>
+ <eba-maven-plugin.version>1.0.0</eba-maven-plugin.version>
<!-- Aries Application Versions -->
- <ariesApplicationApiVersion>1.0.0</ariesApplicationApiVersion>
- <ariesApplicationVersion>1.0.0</ariesApplicationVersion>
-
<ariesApplicationConvertersVersion>1.0.0</ariesApplicationConvertersVersion>
-
<ariesApplicationDefaultLocalPlatformVersion>1.0.0</ariesApplicationDefaultLocalPlatformVersion>
-
<ariesApplicationDeploymentManagementVersion>1.0.0</ariesApplicationDeploymentManagementVersion>
- <ariesApplicationInstallVersion>1.0.0</ariesApplicationInstallVersion>
-
<ariesApplicationItestInterfaceVersion>1.0.0</ariesApplicationItestInterfaceVersion>
-
<ariesApplicationManagementVersion>1.0.0</ariesApplicationManagementVersion>
-
<ariesApplicationModellerVersion>1.0.0</ariesApplicationModellerVersion>
-
<ariesApplicationNoopResolverVersion>1.0.0</ariesApplicationNoopResolverVersion>
-
<ariesApplicationObrResolverVersion>1.0.0</ariesApplicationObrResolverVersion>
- <ariesApplicationRuntimeVersion>1.0.0</ariesApplicationRuntimeVersion>
-
<ariesApplicationRuntimeFrameworkVersion>1.0.0</ariesApplicationRuntimeFrameworkVersion>
-
<ariesApplicationRuntimeFrameworkManagementVersion>1.0.0</ariesApplicationRuntimeFrameworkManagementVersion>
-
<ariesApplicationRuntimeIsolatedVersion>1.0.0</ariesApplicationRuntimeIsolatedVersion>
-
<ariesApplicationRuntimeRepositoryVersion>1.0.0</ariesApplicationRuntimeRepositoryVersion>
- <ariesApplicationUtilsVersion>1.0.0</ariesApplicationUtilsVersion>
+
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
+
<org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version>
+
<org.apache.aries.application.deployment.management.version>1.0.0</org.apache.aries.application.deployment.management.version>
+
<org.apache.aries.application.install.version>1.0.0</org.apache.aries.application.install.version>
+
<org.apache.aries.application.runtime.itest.interfaces.version>1.0.0</org.apache.aries.application.runtime.itest.interfaces.version>
+
<org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version>
+
<org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version>
+
<org.apache.aries.application.resolver.noop.version>1.0.0</org.apache.aries.application.resolver.noop.version>
+
<org.apache.aries.application.resolver.obr.version>1.0.0</org.apache.aries.application.resolver.obr.version>
+
<org.apache.aries.application.runtime.version>1.0.0</org.apache.aries.application.runtime.version>
+
<org.apache.aries.application.runtime.framework.version>1.0.0</org.apache.aries.application.runtime.framework.version>
+
<org.apache.aries.application.runtime.framework.management.version>1.0.0</org.apache.aries.application.runtime.framework.management.version>
+
<org.apache.aries.application.runtime.isolated.version>1.0.0</org.apache.aries.application.runtime.isolated.version>
+
<org.apache.aries.application.runtime.repository.version>1.0.0</org.apache.aries.application.runtime.repository.version>
+
<org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
<!-- Aries Blueprint Versions -->
-
<ariesBlueprintAnnotationApiVersion>1.0.0</ariesBlueprintAnnotationApiVersion>
-
<ariesBlueprintAnnotationImplVersion>1.0.0</ariesBlueprintAnnotationImplVersion>
- <ariesBlueprintApiVersion>1.0.0</ariesBlueprintApiVersion>
- <ariesBlueprintVersion>1.0.0</ariesBlueprintVersion>
- <ariesBlueprintCmVersion>1.0.0</ariesBlueprintCmVersion>
- <ariesBlueprintCoreVersion>1.0.0</ariesBlueprintCoreVersion>
-
- <!-- Aries Jmx Versions -->
- <ariesJmxiApiVersion>1.0.0</ariesJmxiApiVersion>
- <ariesJmxBlueprintApiVersion>1.0.0</ariesJmxBlueprintApiVersion>
- <ariesJmxBlueprintVersion>1.0.0</ariesJmxBlueprintVersion>
- <ariesJmxBlueprintCoreVersion>1.0.0</ariesJmxBlueprintCoreVersion>
- <ariesJmxVersion>1.0.0</ariesJmxVersion>
- <ariesJmxCoreVersion>1.0.0</ariesJmxCoreVersion>
- <ariesJmxWhiteboardVersion>1.0.0</ariesJmxWhiteboardVersion>
+
<org.apache.aries.blueprint.annotation.api.version>1.0.0</org.apache.aries.blueprint.annotation.api.version>
+
<org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version>
<!-- Aries Jndi Versions -->
- <ariesJndiApiVersion>1.0.0</ariesJndiApiVersion>
- <ariesJndiVersion>1.0.0</ariesJndiVersion>
- <ariesJndiCoreVersion>1.0.0</ariesJndiCoreVersion>
- <ariesJndiLegacySupportVersion>1.0.0</ariesJndiLegacySupportVersion>
- <ariesJndiRmiVersion>1.0.0</ariesJndiRmiVersion>
- <ariesJndiUrlVersion>1.0.0</ariesJndiUrlVersion>
+ <org.apache.aries.jndi.version>1.0.0</org.apache.aries.jndi.version>
<!-- Aries Jpa Versions -->
- <ariesJpaApiVersion>1.0.0</ariesJpaApiVersion>
- <ariesJpaBlueprintAriesVersion>1.0.0</ariesJpaBlueprintAriesVersion>
- <ariesJpaContainerVersion>1.0.0</ariesJpaContainerVersion>
-
<ariesJpaContainerContextVersion>1.0.0</ariesJpaContainerContextVersion>
-
- <!-- Aries Proxy Versions -->
- <ariesProxyApiVersion>1.0.0</ariesProxyApiVersion>
- <ariesProxyVersion>1.0.0</ariesProxyVersion>
- <ariesProxyImplVersion>1.0.0</ariesProxyImplVersion>
+
<org.apache.aries.jpa.api.version>1.0.0</org.apache.aries.jpa.api.version>
+
<org.apache.aries.jpa.blueprint.aries.version>1.0.0</org.apache.aries.jpa.blueprint.aries.version>
+
<org.apache.aries.jpa.container.version>1.0.0</org.apache.aries.jpa.container.version>
+
<org.apache.aries.jpa.container.context.version>1.0.0</org.apache.aries.jpa.container.context.version>
<!-- Aries Quiesce Versions -->
- <ariesQuiesceApiVersion>1.0.0</ariesQuiesceApiVersion>
- <ariesQuiesceManagerVersion>1.0.0</ariesQuiesceManagerVersion>
-
+
<org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
+
<org.apache.aries.quiesce.manager.version>1.0.0</org.apache.aries.quiesce.manager.version>
<!-- Aries Testsupport Versions -->
- <ariesTestsupportUnitVersion>1.0.0</ariesTestsupportUnitVersion>
+
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
<!-- Aries Transaction Versions -->
-
<ariesTransactionBlueprintVersion>1.0.0</ariesTransactionBlueprintVersion>
- <ariesTransactionManagerVersion>1.0.0</ariesTransactionManagerVersion>
- <ariesTransactionTestdsVersion>1.0.0</ariesTransactionTestdsVersion>
-
<ariesTransactionWrappersVersion>1.0.0</ariesTransactionWrappersVersion>
-
- <!-- Aries Util Versions -->
- <ariesUtilVersion>1.0.0</ariesUtilVersion>
-
- <!-- Aries Web Versions -->
- <ariesWebVersion>1.0.0</ariesWebVersion>
+
<org.apache.aries.transaction.blueprint.version>1.0.0</org.apache.aries.transaction.blueprint.version>
+
<org.apache.aries.transaction.manager.version>1.0.0</org.apache.aries.transaction.manager.version>
+
<org.apache.aries.transaction.wrappers.version>1.0.0</org.apache.aries.transaction.wrappers.version>
<!-- External Dependencies -->
- <cmVersion>3.2.0-v20070116</cmVersion>
- <servicesVersion>3.1.200-v20070605</servicesVersion>
- <asmVersion>3.3.1</asmVersion>
- <derbyVersion>10.14.2.0</derbyVersion>
- <commonsCollectionsVersion>3.2.2</commonsCollectionsVersion>
- <commonsLangVersion>2.5</commonsLangVersion>
- <commonsPoolVersion>1.5.4</commonsPoolVersion>
- <servicemixBundlesSerpVersion>1.13.1_2</servicemixBundlesSerpVersion>
- <servicemixBundlesCglibVersion>2.1_3_4</servicemixBundlesCglibVersion>
-
- <openjpaVersion>2.2.2</openjpaVersion>
- <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
- <geronimoJtaSpecVersion>1.1.1</geronimoJtaSpecVersion>
- <geronimoTransactionVersion>2.1.3</geronimoTransactionVersion>
- <geronimoServletVersion>1.2</geronimoServletVersion>
-
<geronimoJ2eeConnector15SpecVersion>2.0.0</geronimoJ2eeConnector15SpecVersion>
- <geronimoJsp21SpecVersion>1.0.1</geronimoJsp21SpecVersion>
-
- <paxWebJettyBundleVersion>0.8.1</paxWebJettyBundleVersion>
- <paxWebExtenderWarVersion>0.8.1</paxWebExtenderWarVersion>
- <paxWebJspVersion>0.8.1</paxWebJspVersion>
-
- <felixFileinstallVersion>3.1.4</felixFileinstallVersion>
- <serpVersion>1.13.1</serpVersion>
- <javaxServletVersion>1.2</javaxServletVersion>
-
- <twitter4jVersion>2.0.10</twitter4jVersion>
+ <cm.version>3.2.0-v20070116</cm.version>
+ <services.version>3.1.200-v20070605</services.version>
+ <asm-all.version>3.3.1</asm-all.version>
+ <derby.version>10.14.2.0</derby.version>
+ <commons-collections.version>3.2.2</commons-collections.version>
+ <commons-lang.version>2.5</commons-lang.version>
+ <commons-pool.version>1.5.4</commons-pool.version>
+
<org.apache.servicemix.bundles.serp.version>1.13.1_2</org.apache.servicemix.bundles.serp.version>
+
<org.apache.servicemix.bundles.cglib.version>2.1_3_4</org.apache.servicemix.bundles.cglib.version>
+
+ <openjpa.version>2.2.2</openjpa.version>
+ <geronimo-jpa_2.0_spec.version>1.1</geronimo-jpa_2.0_spec.version>
+ <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
+ <geronimo-transaction.version>2.1.3</geronimo-transaction.version>
+
<geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version>
+
<geronimo-j2ee-connector_1.5_spec.version>2.0.0</geronimo-j2ee-connector_1.5_spec.version>
+ <geronimo-jsp_2.1_spec.version>1.0.1</geronimo-jsp_2.1_spec.version>
+
+ <pax-web.version>0.8.1</pax-web.version>
+
+
<org.apache.felix.fileinstall.version>3.1.4</org.apache.felix.fileinstall.version>
+ <serp.version>1.13.1</serp.version>
+ <javax-servlet.version>1.2</javax-servlet.version>
+
+ <twitter4j.version>2.0.10</twitter4j.version>
<aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages>
@@ -260,7 +225,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>${asmVersion}</version>
+ <version>${asm-all.version}</version>
</dependency>
<dependency>
@@ -288,109 +253,99 @@
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-extender-war</artifactId>
- <version>${paxWebExtenderWarVersion}</version>
+ <version>${pax-web.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
- <version>${paxWebJettyBundleVersion}</version>
+ <version>${pax-web.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jsp</artifactId>
- <version>${paxWebJspVersion}</version>
+ <version>${pax-web.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>${geronimoJ2eeConnector15SpecVersion}</version>
+ <version>${geronimo-j2ee-connector_1.5_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>${geronimoServletVersion}</version>
+ <version>${geronimo-servlet_2.5_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>${geronimoJsp21SpecVersion}</version>
+ <version>${geronimo-jsp_2.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${geronimoTransactionVersion}</version>
+ <version>${geronimo-transaction.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimoJtaSpecVersion}</version>
+ <version>${geronimo-jta_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>${geronimoJpaSpecVersion}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>${javaxServletVersion}</version>
+ <version>${geronimo-jpa_2.0_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derbyVersion}</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${openjpaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${openjpaVersion}</version>
+ <version>${openjpa.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
- <version>${serpVersion}</version>
+ <version>${serp.version}</version>
</dependency>
<!-- bundle version of serp necessary for equinox assembly using
openjpa -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.serp</artifactId>
- <version>${servicemixBundlesSerpVersion}</version>
+
<version>${org.apache.servicemix.bundles.serp.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>${commonsLangVersion}</version>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>${commonsPoolVersion}</version>
+ <version>${commons-pool.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>${commonsCollectionsVersion}</version>
+ <version>${commons-collections.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <version>${servicemixBundlesCglibVersion}</version>
+
<version>${org.apache.servicemix.bundles.cglib.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
- <version>${felixFileinstallVersion}</version>
+ <version>${org.apache.felix.fileinstall.version}</version>
</dependency>
<dependency>
<groupId>net.homeip.yusuke</groupId>
<artifactId>twitter4j</artifactId>
- <version>${twitter4jVersion}</version>
+ <version>${twitter4j.version}</version>
</dependency>
<!-- other aries subproject dependency management -->
@@ -398,99 +353,79 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
- <version>${ariesApplicationApiVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application</artifactId>
- <version>${ariesApplicationVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
-
<artifactId>org.apache.aries.application.converters</artifactId>
- <version>${ariesApplicationConvertersVersion}</version>
+ <version>${org.apache.aries.application.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.default.local.platform</artifactId>
-
<version>${ariesApplicationDefaultLocalPlatformVersion}</version>
+
<version>${org.apache.aries.application.default.local.platform.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.deployment.management</artifactId>
-
<version>${ariesApplicationDeploymentManagementVersion}</version>
+
<version>${org.apache.aries.application.deployment.management.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.install</artifactId>
- <version>${ariesApplicationInstallVersion}</version>
+
<version>${org.apache.aries.application.install.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
- <version>${ariesApplicationManagementVersion}</version>
+
<version>${org.apache.aries.application.management.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.modeller</artifactId>
- <version>${ariesApplicationModellerVersion}</version>
+
<version>${org.apache.aries.application.modeller.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.noop</artifactId>
- <version>${ariesApplicationNoopResolverVersion}</version>
+
<version>${org.apache.aries.application.resolver.noop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
- <version>${ariesApplicationObrResolverVersion}</version>
+
<version>${org.apache.aries.application.resolver.obr.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
- <version>${ariesApplicationRuntimeVersion}</version>
+
<version>${org.apache.aries.application.runtime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework</artifactId>
- <version>${ariesApplicationRuntimeFrameworkVersion}</version>
+
<version>${org.apache.aries.application.runtime.framework.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework.management</artifactId>
-
<version>${ariesApplicationRuntimeFrameworkManagementVersion}</version>
+
<version>${org.apache.aries.application.runtime.framework.management.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.isolated</artifactId>
- <version>${ariesApplicationRuntimeIsolatedVersion}</version>
+
<version>${org.apache.aries.application.runtime.isolated.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
- <version>${ariesApplicationItestInterfaceVersion}</version>
+
<version>${org.apache.aries.application.runtime.itest.interfaces.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.repository</artifactId>
- <version>${ariesApplicationRuntimeRepositoryVersion}</version>
+
<version>${org.apache.aries.application.runtime.repository.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
- <version>${ariesApplicationUtilsVersion}</version>
+
<version>${org.apache.aries.application.utils.version}</version>
</dependency>
<!-- blueprint -->
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
-
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>${ariesBlueprintAnnotationApiVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
-
<artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
- <version>${ariesBlueprintAnnotationImplVersion}</version>
- </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
@@ -499,7 +434,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>${ariesBlueprintVersion}</version>
+ <version>${org.apache.aries.blueprint.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -511,147 +446,71 @@
<artifactId>org.apache.aries.blueprint.core</artifactId>
<version>${org.apache.aries.blueprint.core.version}</version>
</dependency>
- <!-- jmx -->
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.api</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
- <version>${ariesJmxBlueprintApiVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint</artifactId>
- <version>${ariesJmxBlueprintVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
- <version>${ariesJmxBlueprintCoreVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
- <version>${ariesJmxVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${ariesJmxCoreVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
- <version>${ariesJmxWhiteboardVersion}</version>
- </dependency>
<!-- jndi -->
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.api</artifactId>
- <version>${ariesJndiApiVersion}</version>
- </dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi</artifactId>
- <version>${ariesJndiVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.core</artifactId>
- <version>${ariesJndiCoreVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.legacy.support</artifactId>
- <version>${ariesJndiLegacySupportVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.rmi</artifactId>
- <version>${ariesJndiRmiVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url</artifactId>
- <version>${ariesJndiUrlVersion}</version>
+ <version>${org.apache.aries.jndi.version}</version>
</dependency>
<!-- jpa -->
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
- <version>${ariesJpaApiVersion}</version>
+ <version>${org.apache.aries.jpa.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
- <version>${ariesJpaBlueprintAriesVersion}</version>
+
<version>${org.apache.aries.jpa.blueprint.aries.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
- <version>${ariesJpaContainerVersion}</version>
+ <version>${org.apache.aries.jpa.container.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
- <version>${ariesJpaContainerContextVersion}</version>
+
<version>${org.apache.aries.jpa.container.context.version}</version>
</dependency>
<!-- proxy -->
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <version>${ariesProxyApiVersion}</version>
- </dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${org.apache.aries.proxy.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>${ariesProxyImplVersion}</version>
- </dependency>
<!-- quiesce -->
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
- <version>${ariesQuiesceApiVersion}</version>
+ <version>${org.apache.aries.quiesce.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.manager</artifactId>
- <version>${ariesQuiesceManagerVersion}</version>
+ <version>${org.apache.aries.quiesce.manager.version}</version>
</dependency>
<!-- Testsupport -->
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>${ariesTestsupportUnitVersion}</version>
+ <version>${org.apache.aries.testsupport.unit.version}</version>
</dependency>
<!-- transaction -->
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
- <version>${ariesTransactionBlueprintVersion}</version>
+
<version>${org.apache.aries.transaction.blueprint.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
- <version>${ariesTransactionManagerVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.testds</artifactId>
- <version>${ariesTransactionTestdsVersion}</version>
+
<version>${org.apache.aries.transaction.manager.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.wrappers</artifactId>
- <version>${ariesTransactionWrappersVersion}</version>
+
<version>${org.apache.aries.transaction.wrappers.version}</version>
</dependency>
<!--util-->
<dependency>
@@ -659,29 +518,6 @@
<artifactId>org.apache.aries.util</artifactId>
<version>${org.apache.aries.util.version}</version>
</dependency>
- <!-- web-->
- <dependency>
- <groupId>org.apache.aries.web</groupId>
- <artifactId>org.apache.aries.web.urlhandler</artifactId>
- <version>${ariesWebVersion}</version>
- </dependency>
-
- <!-- internal samples dependencies -->
- <dependency>
- <groupId>org.apache.aries.samples.ariestrader</groupId>
- <artifactId>ariestrader</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.samples.blog</groupId>
- <artifactId>blog</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.samples.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/samples/twitter/pom.xml b/samples/twitter/pom.xml
index bc9bb0be3..6abad1b40 100644
--- a/samples/twitter/pom.xml
+++ b/samples/twitter/pom.xml
@@ -54,7 +54,6 @@
</dependencies>
</dependencyManagement>
-
<modules>
<module>twitter-twitter4j</module>
<module>twitter-bundle</module>
diff --git a/samples/twitter/twitter-eba/pom.xml
b/samples/twitter/twitter-eba/pom.xml
index cb30269df..cd4844124 100644
--- a/samples/twitter/twitter-eba/pom.xml
+++ b/samples/twitter/twitter-eba/pom.xml
@@ -46,7 +46,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>
diff --git a/samples/twitter/twitter-itests/pom.xml
b/samples/twitter/twitter-itests/pom.xml
index 9045a0df3..83aa84f51 100644
--- a/samples/twitter/twitter-itests/pom.xml
+++ b/samples/twitter/twitter-itests/pom.xml
@@ -35,16 +35,15 @@
<properties>
<asm.version>4.0</asm.version>
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
- <exam.version>4.13.5</exam.version>
<javax.inject.version>1</javax.inject.version>
<logback.version>0.9.29</logback.version>
<org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
<org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
- <swissbox.version>1.7.0</swissbox.version>
- <tinybundles.version>2.0.0</tinybundles.version>
- <url.version>2.6.16</url.version>
+ <pax-exam.version>4.13.5</pax-exam.version>
+ <pax-tinybundles.version>2.0.0</pax-tinybundles.version>
+ <pax-url.version>2.6.16</pax-url.version>
</properties>
<dependencies>
@@ -193,31 +192,31 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
+ <version>${pax-url.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -235,7 +234,7 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
- <version>${tinybundles.version}</version>
+ <version>${pax-tinybundles.version}</version>
<exclusions>
<exclusion>
<artifactId>org.osgi.core</artifactId>
diff --git
a/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml
b/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml
index 11fc22d34..ff9a14fc5 100644
---
a/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml
+++
b/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='utf-8'?>
-<?xml-stylesheet type='text/xsl' href='http://www2.osgi.org/www/obr2html.xsl'?>
+<?xml version='1.0' encoding='utf-8'?>
+<?xml-stylesheet type='text/xsl' href='http://www2.osgi.org/www/obr2html.xsl'?>
<repository lastmodified='20101105121848.125' name='Untitled'>
- <resource id='org.apache.commons.lang/${commonsLangVersion}'
presentationname='Commons Lang' symbolicname='org.apache.commons.lang'
uri='commons.lang.location' version='${commonsLangVersion}'>
+ <resource id='org.apache.commons.lang/${commons-lang.version}'
presentationname='Commons Lang' symbolicname='org.apache.commons.lang'
uri='commons.lang.location' version='${commons-lang.version}'>
<description>
Commons Lang, a package of Java utility classes for the
classes that are in java.lang's hierarchy, or are considered
@@ -21,73 +21,73 @@
<p n='manifestversion' v='2'/>
<p n='presentationname' v='Commons Lang'/>
<p n='symbolicname' v='org.apache.commons.lang'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.math'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.enums'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.builder'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.exception'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.enum'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.mutable'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.text'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang.time'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
<capability name='package'>
<p n='package' v='org.apache.commons.lang'/>
- <p n='version' t='version' v='${commonsLangVersion}'/>
+ <p n='version' t='version' v='${commons-lang.version}'/>
</capability>
- <require extend='false'
filter='(&(package=org.apache.commons.lang)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang ;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang ;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.builder)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.builder
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.builder)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.builder
;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.enum)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.enum
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.enum)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.enum
;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.enums)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.enums
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.enums)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.enums
;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.exception)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.exception
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.exception)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.exception
;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.math)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.math
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.math)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.math
;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.mutable)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.mutable
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.mutable)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.mutable
;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.text)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.text
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.text)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.text
;version=${commons-lang.version}
</require>
- <require extend='false'
filter='(&(package=org.apache.commons.lang.time)(version>=${commonsLangVersion}))'
multiple='false' name='package' optional='false'>
- Import package org.apache.commons.lang.time
;version=${commonsLangVersion}
+ <require extend='false'
filter='(&(package=org.apache.commons.lang.time)(version>=${commons-lang.version}))'
multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.time
;version=${commons-lang.version}
</require>
</resource>
- <resource id='twitter4j/${twitter4jVersion}' presentationname='Apache Aries
Application Bundlise Twitter4j' symbolicname='twitter4j'
uri='twitter4j.location' version='${twitter4jVersion}'>
+ <resource id='twitter4j/${twitter4j.version}' presentationname='Apache Aries
Application Bundlise Twitter4j' symbolicname='twitter4j'
uri='twitter4j.location' version='${twitter4j.version}'>
<description>
Application used to bundlelise twitter4j
</description>
@@ -104,12 +104,12 @@
<p n='manifestversion' v='2'/>
<p n='presentationname' v='Apache Aries Application Bundlise Twitter4j'/>
<p n='symbolicname' v='twitter4j'/>
- <p n='version' t='version' v='${twitter4jVersion}'/>
+ <p n='version' t='version' v='${twitter4j.version}'/>
</capability>
<capability name='package'>
<p n='package' v='twitter4j'/>
<p n='uses'
v='javax.xml.transform.dom,javax.xml.transform.stream,org.w3c.dom,javax.xml.transform'/>
- <p n='version' t='version' v='${twitter4jVersion}'/>
+ <p n='version' t='version' v='${twitter4j.version}'/>
</capability>
<require extend='false'
filter='(&(package=com.sun.syndication.feed.synd)(version>=0.0.0))'
multiple='false' name='package' optional='true'>
Import package com.sun.syndication.feed.synd
@@ -144,8 +144,8 @@
<require extend='false'
filter='(&(package=org.xml.sax)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
Import package org.xml.sax
</require>
- <require extend='false'
filter='(&(package=twitter4j)(version>=${twitter4jVersion}))'
multiple='false' name='package' optional='false'>
- Import package twitter4j ;version=${twitter4jVersion}
+ <require extend='false'
filter='(&(package=twitter4j)(version>=${twitter4j.version}))'
multiple='false' name='package' optional='false'>
+ Import package twitter4j ;version=${twitter4j.version}
</require>
</resource>
</repository>
diff --git
a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
index 0f7711bad..95d94ee83 100644
---
a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
+++
b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
@@ -196,9 +196,6 @@ public class TwitterTest extends AbstractIntegrationTest
mavenBundle("org.ow2.asm",
"asm-all").versionAsInProject(),
mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.apache.aries.samples.twitter",
"org.apache.aries.samples.twitter.twitter4j").versionAsInProject()
-
- // For debugging
- //vmOption
("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5010"),
);
}
}
