diff --git a/README.md b/README.md index c980bd05d4..9447b117af 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ See [Apache Aries Website](http://aries.apache.org/). - [![SPI Fly - CI Build](https://github.com/apache/aries/actions/workflows/spi-fly.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/spi-fly.yml) - [![Subsystem - CI Build](https://github.com/apache/aries/actions/workflows/subsystem.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/subsystem.yml) - [![Transaction - CI Build](https://github.com/apache/aries/actions/workflows/transaction.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/transaction.yml) -- Tutorials - Missing - [![Versioning - CI Build](https://github.com/apache/aries/actions/workflows/versioning.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/versioning.yml) - [![Web - CI Build](https://github.com/apache/aries/actions/workflows/web.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/web.yml) - [![Util - CI Build](https://github.com/apache/aries/actions/workflows/util.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/util.yml) diff --git a/application/application-api/pom.xml b/application/application-api/pom.xml index 6fc2e43b89..fa8328db13 100644 --- a/application/application-api/pom.xml +++ b/application/application-api/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application API 1.0.1-SNAPSHOT - Application API. + Application API. @@ -53,8 +53,10 @@ org.apache.aries.application.modelling; org.apache.aries.application.modelling.utils, - + 1.0.0 + + 1.0.0 @@ -63,10 +65,10 @@ org.osgi.core provided - - org.apache.aries - org.apache.aries.util - 1.0.0 + + org.apache.aries + org.apache.aries.util + ${org.apache.aries.util.version} diff --git a/application/application-bundle/pom.xml b/application/application-bundle/pom.xml index e4790f51c5..fbfc496a94 100644 --- a/application/application-bundle/pom.xml +++ b/application/application-bundle/pom.xml @@ -34,8 +34,8 @@ Apache Aries Application Bundle 1.0.1-SNAPSHOT - This bundle is a standalone bundle to support - Aries applications. + This bundle is a standalone bundle to support + Aries applications. @@ -68,28 +68,33 @@ OSGI-INF* 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.management - 1.0.0 + ${org.apache.aries.application.management.version} org.apache.aries.application org.apache.aries.application.runtime - 1.0.0 + ${org.apache.aries.application.runtime.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.osgi @@ -107,7 +112,7 @@ provided - + @@ -72,13 +78,13 @@ org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.apache.aries.web org.apache.aries.web.urlhandler provided - 1.0.0 + ${org.apache.aries.web.urlhandler.version} @@ -95,7 +101,7 @@ org.ow2.asm asm-all provided - 5.0.3 + ${asm-all.version} org.slf4j diff --git a/application/application-default-local-platform/pom.xml b/application/application-default-local-platform/pom.xml index ca481528ff..ca2edda325 100644 --- a/application/application-default-local-platform/pom.xml +++ b/application/application-default-local-platform/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application Default local platform 1.0.1-SNAPSHOT - Implementation of the default local Platform Repository + Implementation of the default local Platform Repository @@ -47,13 +47,15 @@ - org.apache.aries.application.management.spi.runtime;provide:=true, - * + org.apache.aries.application.management.spi.runtime;provide:=true, + * org.apache.aries.application.local.platform.impl 1.0.0 + + 1.0.0 @@ -65,7 +67,7 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} diff --git a/application/application-deployment-management/pom.xml b/application/application-deployment-management/pom.xml index 85100c3b1b..c9674ff1a4 100644 --- a/application/application-deployment-management/pom.xml +++ b/application/application-deployment-management/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application Deployment Management 1.0.1-SNAPSHOT - Deployment Manager for resolving an Aries Applications. + Deployment Manager for resolving an Aries Applications. @@ -44,12 +44,18 @@ - + - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.management.spi.resolve;provide:=true, + * 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 @@ -59,15 +65,15 @@ property not set" error. --> - org.osgi - org.osgi.core - provided + org.osgi + org.osgi.core + provided org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} junit @@ -77,12 +83,12 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} - org.apache.aries - org.apache.aries.util - 1.0.0 + org.apache.aries + org.apache.aries.util + ${org.apache.aries.util.version} org.slf4j @@ -95,14 +101,14 @@ test - org.apache.aries.application - org.apache.aries.application.utils - 1.0.0 + org.apache.aries.application + org.apache.aries.application.utils + ${org.apache.aries.application.utils.version} org.apache.aries.application org.apache.aries.application.modeller - 1.0.0 + ${org.apache.aries.application.modeller.version} diff --git a/application/application-distro/pom.xml b/application/application-distro/pom.xml index a5c532abfe..8cfd96a5b7 100644 --- a/application/application-distro/pom.xml +++ b/application/application-distro/pom.xml @@ -19,18 +19,18 @@ --> - 4.0.0 + 4.0.0 - org.apache.aries - parent - 2.0.0 - ../../parent/pom.xml + org.apache.aries + parent + 2.0.0 + ../../parent/pom.xml - org.apache.aries.application - org.apache.aries.application-distro - Application distribution + org.apache.aries.application + org.apache.aries.application-distro + Application distribution 1.0.0-SNAPSHOT pom @@ -40,74 +40,87 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 2.2-beta-5 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + + - + org.apache.aries.application org.apache.aries.application.runtime - 1.0.0 + ${org.apache.aries.application.runtime.version} - + org.apache.aries.application org.apache.aries.application.resolver.obr - 1.0.0 + ${org.apache.aries.application.resolver.obr.version} - + org.apache.aries.application org.apache.aries.application.install - 1.0.0 + ${org.apache.aries.application.install.version} - + org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} - + org.apache.aries.application org.apache.aries.application.management - 1.0.0 + ${org.apache.aries.application.management.version} - + org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} - + org.apache.aries.application org.apache.aries.application.modeller - 1.0.0 + ${org.apache.aries.application.modeller.version} - + org.apache.aries.application org.apache.aries.application.default.local.platform - 1.0.0 + ${org.apache.aries.application.default.local.platform.version} - + org.apache.aries.application org.apache.aries.application.deployment.management - 1.0.0 + ${org.apache.aries.application.deployment.management.version} - - - maven-assembly-plugin - 2.2-beta-5 + + + maven-assembly-plugin + ${maven-assembly-plugin.version} - - package - - single - - - - src/main/assemblies/application-distro.xml - - - + + package + + single + + + + src/main/assemblies/application-distro.xml + + + - - - + + + diff --git a/application/application-install/pom.xml b/application/application-install/pom.xml index 666553610f..bdc3025878 100644 --- a/application/application-install/pom.xml +++ b/application/application-install/pom.xml @@ -45,6 +45,11 @@ 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 + 3.1.4 @@ -52,12 +57,12 @@ org.apache.felix org.apache.felix.fileinstall - 3.1.4 + ${org.apache.felix.fileinstall.version} org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} junit @@ -68,7 +73,7 @@ org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.slf4j @@ -93,7 +98,7 @@ org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} diff --git a/application/application-isolated-distro/pom.xml b/application/application-isolated-distro/pom.xml index d8a942bf2a..4097cf9998 100644 --- a/application/application-isolated-distro/pom.xml +++ b/application/application-isolated-distro/pom.xml @@ -19,18 +19,18 @@ --> - 4.0.0 + 4.0.0 - org.apache.aries - parent - 2.0.0 - ../../parent/pom.xml + org.apache.aries + parent + 2.0.0 + ../../parent/pom.xml - org.apache.aries.application - org.apache.aries.application-isolated-distro - Application distribution for isolated application support + org.apache.aries.application + org.apache.aries.application-isolated-distro + Application distribution for isolated application support 1.0.0-SNAPSHOT pom @@ -40,89 +40,105 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 2.2-beta-5 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + + - + org.apache.aries.application org.apache.aries.application.runtime.isolated - 1.0.0 + ${org.apache.aries.application.runtime.isolated.version} - + org.apache.aries.application org.apache.aries.application.runtime.framework - 1.0.0 + ${org.apache.aries.application.runtime.framework.version} - + org.apache.aries.application org.apache.aries.application.runtime.framework.management - 1.0.0 + ${org.apache.aries.application.runtime.framework.management.version} - + org.apache.aries.application org.apache.aries.application.runtime.repository - 1.0.0 + ${org.apache.aries.application.runtime.repository.version} - + org.apache.aries.application org.apache.aries.application.resolver.obr - 1.0.0 + ${org.apache.aries.application.resolver.obr.version} - + org.apache.aries.application org.apache.aries.application.install - 1.0.0 + ${org.apache.aries.application.install.version} - + org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} - + org.apache.aries.application org.apache.aries.application.management - 1.0.0 + ${org.apache.aries.application.management.version} - + org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} - + org.apache.aries.application org.apache.aries.application.modeller - 1.0.0 + ${org.apache.aries.application.modeller.version} - + org.apache.aries.application org.apache.aries.application.default.local.platform - 1.0.0 + ${org.apache.aries.application.default.local.platform.version} - + org.apache.aries.application org.apache.aries.application.deployment.management - 1.0.0 + ${org.apache.aries.application.deployment.management.version} - - - maven-assembly-plugin - 2.2-beta-5 + + + maven-assembly-plugin + ${maven-assembly-plugin.version} - - package - - single - - - - src/main/assemblies/application-isolated-distro.xml - - - + + package + + single + + + + src/main/assemblies/application-isolated-distro.xml + + + - - - + + + diff --git a/application/application-itest-interface/pom.xml b/application/application-itest-interface/pom.xml index e1bf8ac435..95df460d00 100644 --- a/application/application-itest-interface/pom.xml +++ b/application/application-itest-interface/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application itests sample application interface 1.0.1-SNAPSHOT - Interface class(es) for aplication runtime itests. + Interface class(es) for aplication runtime itests. @@ -43,12 +43,12 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + - - org.apache.aries.sample - - - + + org.apache.aries.sample + + + diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml index 0470c3a2d1..145ea5b16c 100644 --- a/application/application-itests/pom.xml +++ b/application/application-itests/pom.xml @@ -44,7 +44,30 @@ + 5.0.3 + 1.3 4.5.0 + 1.1.1 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.2-SNAPSHOT + 2.0.0-SNAPSHOT + 1.0.0 + 1.0.0 + 1.6.4 + 1.2.4 + 3.8.0.v20120529-1548 2.2.0 @@ -58,35 +81,35 @@ org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} test - - org.ops4j.pax.logging - pax-logging-api - test - - - org.ops4j.pax.logging - pax-logging-service - test - + + org.ops4j.pax.logging + pax-logging-api + test + + + org.ops4j.pax.logging + pax-logging-service + test + - - org.ops4j.pax.exam - pax-exam + + org.ops4j.pax.exam + pax-exam ${exam.version} - test - - - org.ops4j.pax.exam - pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-junit4 ${exam.version} - test - + test + org.ops4j.pax.exam pax-exam-container-native @@ -108,7 +131,7 @@ org.apache.aries.testsupport org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} test @@ -116,7 +139,7 @@ org.apache.felix org.apache.felix.configadmin - 1.2.4 + ${org.apache.felix.configadmin.version} org.apache.felix @@ -131,124 +154,124 @@ org.apache.felix org.apache.felix.bundlerepository - 1.6.4 + ${org.apache.felix.bundlerepository.version} test org.apache.aries org.apache.aries.util - 1.0.0 + ${org.apache.aries.util.version} test org.apache.aries.blueprint org.apache.aries.blueprint - 1.0.0 + ${org.apache.aries.blueprint.version} test org.apache.aries.proxy org.apache.aries.proxy - 1.0.2-SNAPSHOT + ${org.apache.aries.proxy.version} test org.ow2.asm asm-all - 5.0.3 + ${asm-all.version} test org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} test org.apache.aries.application org.apache.aries.application.runtime.itest.interfaces - 1.0.0 + ${org.apache.aries.application.runtime.itest.interfaces.version} test org.apache.aries.application org.apache.aries.application.management - 1.0.0 + ${org.apache.aries.application.management.version} test - org.apache.aries.application - org.apache.aries.application.runtime.framework - 1.0.0 - test + org.apache.aries.application + org.apache.aries.application.runtime.framework + ${org.apache.aries.application.runtime.framework.version} + test - org.apache.aries.application - org.apache.aries.application.runtime.framework.management - 1.0.0 - test + org.apache.aries.application + org.apache.aries.application.runtime.framework.management + ${org.apache.aries.application.runtime.framework.management.version} + test - org.apache.aries.application - org.apache.aries.application.runtime.repository - 1.0.0 - test + org.apache.aries.application + org.apache.aries.application.runtime.repository + ${org.apache.aries.application.runtime.repository.version} + test - org.apache.aries.application - org.apache.aries.application.runtime.isolated - 1.0.0 - test + org.apache.aries.application + org.apache.aries.application.runtime.isolated + ${org.apache.aries.application.runtime.isolated.version} + test - org.apache.aries.application - org.apache.aries.application.runtime - 1.0.0 - test + org.apache.aries.application + org.apache.aries.application.runtime + ${org.apache.aries.application.runtime.version} + test org.apache.aries.application org.apache.aries.application.resolver.obr - 1.0.0 + ${org.apache.aries.application.resolver.obr.version} test org.apache.aries.application org.apache.aries.application.resolver.noop - 1.0.0 + ${org.apache.aries.application.resolver.noop.version} test - org.apache.aries.application - org.apache.aries.application.resolve.transform.cm - 1.0.0 - + org.apache.aries.application + org.apache.aries.application.resolve.transform.cm + ${org.apache.aries.application.resolve.transform.cm.version} + - org.apache.aries.application - org.apache.aries.application.default.local.platform - 1.0.0 - test + org.apache.aries.application + org.apache.aries.application.default.local.platform + ${org.apache.aries.application.default.local.platform.version} + test - org.apache.aries.transaction - org.apache.aries.transaction.blueprint - 1.0.0 - test + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + ${org.apache.aries.transaction.blueprint.version} + test - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 - test + org.apache.geronimo.specs + geronimo-jta_1.1_spec + ${geronimo-jta_1.1_spec.version} + test - + org.apache.servicemix.tooling depends-maven-plugin - 1.3 + ${depends-maven-plugin.version} generate-depends-file diff --git a/application/application-management/pom.xml b/application/application-management/pom.xml index 5e1f46ef3d..3577cecc7b 100644 --- a/application/application-management/pom.xml +++ b/application/application-management/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application Management 1.0.1-SNAPSHOT - Implementation of the application management API + Implementation of the application management API @@ -47,17 +47,21 @@ - org.apache.aries.application.management;provide:=true, - org.apache.aries.application.management.spi.repository;provide:=true, - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.management;provide:=true, + org.apache.aries.application.management.spi.repository;provide:=true, + org.apache.aries.application.management.spi.resolve;provide:=true, + * org.apache.aries.application.management.impl; - org.apache.aries.application.management.internal; - org.apache.aries.application.management.repository + org.apache.aries.application.management.internal; + org.apache.aries.application.management.repository 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 @@ -69,18 +73,18 @@ org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.application org.apache.aries.application.deployment.management - 1.0.0 + ${org.apache.aries.application.deployment.management.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.osgi diff --git a/application/application-modeller-common-test/pom.xml b/application/application-modeller-common-test/pom.xml index 1d26056d50..33ffc7008f 100644 --- a/application/application-modeller-common-test/pom.xml +++ b/application/application-modeller-common-test/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application Modelling tests 1.0.1-SNAPSHOT - Modelling utilities for working with Aries Applications (distribution for offline use). + Modelling utilities for working with Aries Applications (distribution for offline use). @@ -43,11 +43,19 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 1.0.0 + 1.0.0 + 1.0.0 + 4.2.0 + 4.2.0 + + org.apache.aries.application application-modeller-standalone - 1.0.0 + ${application-modeller-standalone.version} junit @@ -55,16 +63,16 @@ test - org.osgi - org.osgi.core - 4.2.0 - test + org.osgi + org.osgi.core + ${org.osgi.core.version} + test - org.osgi - org.osgi.compendium - 4.2.0 - test + org.osgi + org.osgi.compendium + ${org.osgi.compendium.version} + test org.slf4j @@ -80,17 +88,17 @@ org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.0.0 + ${org.apache.aries.blueprint.core.version} - - org.apache.aries.proxy - org.apache.aries.proxy.api - + + org.apache.aries.proxy + org.apache.aries.proxy.api + diff --git a/application/application-modeller-standalone/pom.xml b/application/application-modeller-standalone/pom.xml index 381c88e5f5..9c2c88523a 100644 --- a/application/application-modeller-standalone/pom.xml +++ b/application/application-modeller-standalone/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application Modelling Standalone 1.0.1-SNAPSHOT - Modelling utilities for working with Aries Applications (distribution for offline use). + Modelling utilities for working with Aries Applications (distribution for offline use). @@ -43,70 +43,80 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + + org.apache.aries org.apache.aries.util - 1.0.0 + ${org.apache.aries.util.version} org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.modeller - 1.0.0 + ${org.apache.aries.application.modeller.version} - - org.apache.aries.blueprint - org.apache.aries.blueprint.core - + + org.apache.aries.blueprint + org.apache.aries.blueprint.core + - org.apache.aries.application - org.apache.aries.application.utils - 1.0.0 + org.apache.aries.application + org.apache.aries.application.utils + ${org.apache.aries.application.utils.version} - org.apache.aries.blueprint - org.apache.aries.blueprint.api - 1.0.0 + org.apache.aries.blueprint + org.apache.aries.blueprint.api + ${org.apache.aries.blueprint.api.version} org.apache.aries.blueprint blueprint-parser - 1.0.0 + ${blueprint-parser.version} org.apache.aries.ejb org.apache.aries.ejb.modeller - 1.0.0 + ${org.apache.aries.ejb.modeller.version} - - - maven-assembly-plugin - - - jar-with-dependencies - - - - - jar-with-dependencies - package - - single - - - - - + + + maven-assembly-plugin + + + jar-with-dependencies + + + + + jar-with-dependencies + package + + single + + + + + diff --git a/application/application-modeller/pom.xml b/application/application-modeller/pom.xml index bab4a7b286..e4fafaf3fa 100644 --- a/application/application-modeller/pom.xml +++ b/application/application-modeller/pom.xml @@ -34,7 +34,7 @@ Apache Aries Application Modelling 1.0.1-SNAPSHOT - Modelling utilities for working with Aries Applications. + Modelling utilities for working with Aries Applications. @@ -44,18 +44,25 @@ - + org.apache.aries.application.modelling.impl; org.apache.aries.application.modelling.internal; org.apache.aries.application.modelling.utils.impl - - + + org.apache.aries.application.modelling;provide:=true, org.apache.aries.application.modelling.utils;provide:=true, * 1.0.0 + + 1.0.0 + 1.0.0 + 1.2.0 + 1.0.0 + 1.0.0 + 1.0.0 @@ -67,24 +74,24 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} - org.apache.aries - org.apache.aries.util - 1.0.0 + org.apache.aries + org.apache.aries.util + ${org.apache.aries.util.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.apache.aries.jndi org.apache.aries.jndi.api provided - 1.0.0 + ${org.apache.aries.jndi.api.version} - org.apache.aries.application - org.apache.aries.application.resolve.transform.cm - 1.0.0 + org.apache.aries.application + org.apache.aries.application.resolve.transform.cm + ${org.apache.aries.application.resolve.transform.cm.version} org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} @@ -81,83 +94,83 @@ org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} test - org.apache.aries - org.apache.aries.util - 1.0.0 - test - - - org.apache.aries.blueprint - org.apache.aries.blueprint - 1.0.0 - test - - - org.apache.aries.proxy - org.apache.aries.proxy - 1.0.2-SNAPSHOT - test - - - org.ow2.asm + org.apache.aries + org.apache.aries.util + ${org.apache.aries.util.version} + test + + + org.apache.aries.blueprint + org.apache.aries.blueprint + ${org.apache.aries.blueprint.version} + test + + + org.apache.aries.proxy + org.apache.aries.proxy + ${org.apache.aries.proxy.version} + test + + + org.ow2.asm asm-all - 5.0.3 - test - + ${asm-all.version} + test + - - org.ops4j.pax.logging - pax-logging-api - test - - - org.ops4j.pax.logging - pax-logging-service - test - + + org.ops4j.pax.logging + pax-logging-api + test + + + org.ops4j.pax.logging + pax-logging-service + test + - - org.ops4j.pax.exam - pax-exam - 3.4.0 - test - + + org.ops4j.pax.exam + pax-exam + ${pax-exam.version} + test + org.ops4j.pax.exam pax-exam-junit4 - 3.4.0 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-container-forked - 3.4.0 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-link-mvn - 3.4.0 + ${pax-exam.version} test org.ops4j.pax.url pax-url-aether - 1.6.0 + ${pax-url-aether.version} test - org.apache.aries.testsupport - org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT - test + org.apache.aries.testsupport + org.apache.aries.testsupport.unit + ${org.apache.aries.testsupport.unit.version} + test @@ -166,7 +179,7 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.3 + ${depends-maven-plugin.version} generate-depends-file @@ -185,7 +198,7 @@ - + ci-build-profile diff --git a/application/application-resolve-transform-cm/pom.xml b/application/application-resolve-transform-cm/pom.xml index 94ec414bbe..7962719290 100644 --- a/application/application-resolve-transform-cm/pom.xml +++ b/application/application-resolve-transform-cm/pom.xml @@ -45,13 +45,16 @@ - org.apache.aries.application.management.spi.resolve;provide:=true, - * + org.apache.aries.application.management.spi.resolve;provide:=true, + * org.apache.aries.application.resolve.transform.cm 1.0.0 + + 1.0.0 + 1.0.0 @@ -63,12 +66,12 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} @@ -89,5 +92,5 @@ - + diff --git a/application/application-runtime-framework-management/pom.xml b/application/application-runtime-framework-management/pom.xml index db1cfec4e1..7cb8b338cc 100644 --- a/application/application-runtime-framework-management/pom.xml +++ b/application/application-runtime-framework-management/pom.xml @@ -47,16 +47,21 @@ - org.apache.aries.application.management;provide:=true, - org.apache.aries.application.management.spi.framework;provide:=true, - * + org.apache.aries.application.management;provide:=true, + org.apache.aries.application.management.spi.framework;provide:=true, + * - org.apache.aries.application.runtime.framework.management + org.apache.aries.application.runtime.framework.management 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 - + junit @@ -66,23 +71,23 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.runtime.framework - 1.0.0 + ${org.apache.aries.application.runtime.framework.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.osgi @@ -123,5 +128,5 @@ - + diff --git a/application/application-runtime-framework/pom.xml b/application/application-runtime-framework/pom.xml index bf4f5c4d21..446e97a142 100644 --- a/application/application-runtime-framework/pom.xml +++ b/application/application-runtime-framework/pom.xml @@ -46,19 +46,24 @@ - org.apache.aries.application.runtime.framework.utils + org.apache.aries.application.runtime.framework.utils - org.apache.aries.application.management.spi.framework;provide:=true, - * + org.apache.aries.application.management.spi.framework;provide:=true, + * org.apache.aries.application.runtime.framework; - org.apache.aries.application.runtime.framework.config + org.apache.aries.application.runtime.framework.config 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 + 3.5.0.v20090520 - + junit @@ -68,18 +73,18 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.osgi @@ -102,11 +107,11 @@ test - org.eclipse - osgi - 3.5.0.v20090520 - jar - provided + org.eclipse + osgi + ${osgi.version} + jar + provided @@ -127,5 +132,5 @@ - + diff --git a/application/application-runtime-isolated/pom.xml b/application/application-runtime-isolated/pom.xml index 12fb8e71b8..7eef7f89b2 100644 --- a/application/application-runtime-isolated/pom.xml +++ b/application/application-runtime-isolated/pom.xml @@ -47,17 +47,22 @@ - org.apache.aries.application.management;provide:=true, - org.apache.aries.application.management.spi.framework;provide:=true, - org.apache.aries.application.management.spi.runtime;provide:=true, - * + org.apache.aries.application.management;provide:=true, + org.apache.aries.application.management.spi.framework;provide:=true, + org.apache.aries.application.management.spi.runtime;provide:=true, + * - org.apache.aries.application.runtime.isolated.impl + org.apache.aries.application.runtime.isolated.impl 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 + 3.5.0.v20090520 - + junit @@ -67,18 +72,18 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.osgi @@ -101,11 +106,11 @@ test - org.eclipse - osgi - 3.5.0.v20090520 - jar - provided + org.eclipse + osgi + ${osgi.version} + jar + provided @@ -126,5 +131,5 @@ - + diff --git a/application/application-runtime-repository/pom.xml b/application/application-runtime-repository/pom.xml index ae0a7092fb..8d7aa1bed8 100644 --- a/application/application-runtime-repository/pom.xml +++ b/application/application-runtime-repository/pom.xml @@ -47,15 +47,19 @@ - org.apache.aries.application.management.spi.repository;provide:=true, - * + org.apache.aries.application.management.spi.repository;provide:=true, + * - org.apache.aries.application.runtime.repository + org.apache.aries.application.runtime.repository 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 - + junit @@ -65,18 +69,18 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.osgi @@ -117,5 +121,5 @@ - + diff --git a/application/application-runtime/pom.xml b/application/application-runtime/pom.xml index efe2c50a12..11c9376aee 100644 --- a/application/application-runtime/pom.xml +++ b/application/application-runtime/pom.xml @@ -43,15 +43,18 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - - + + org.apache.aries.application.management;provide:=true, org.apache.aries.application.management.spi.runtime;provide:=true, * 1.0.0 - + + 1.0.0 + 1.0.0 + @@ -62,13 +65,13 @@ org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} org.osgi @@ -110,4 +113,4 @@ - + diff --git a/application/application-tooling-repository-generator/pom.xml b/application/application-tooling-repository-generator/pom.xml index 05639c7228..6ec9bcd9f3 100644 --- a/application/application-tooling-repository-generator/pom.xml +++ b/application/application-tooling-repository-generator/pom.xml @@ -48,25 +48,47 @@ org.apache.aries.application.repository.generator 1.0.0 + + 5.0.3 + 3.2.0-v20070116 + 1.1 + 1.1.1 + 2.2.1 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.2-SNAPSHOT + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.6.4 + 3.8.0.v20120529-1548 + 3.1.200-v20070605 org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} org.eclipse.equinox cm - 3.2.0-v20070116 + ${cm.version} org.eclipse.osgi services - 3.1.200-v20070605 + ${services.version} @@ -82,102 +104,102 @@ org.apache.felix org.apache.felix.bundlerepository - 1.6.4 + ${org.apache.felix.bundlerepository.version} org.apache.aries.blueprint org.apache.aries.blueprint - 1.0.0 + ${org.apache.aries.blueprint.version} org.apache.aries.proxy org.apache.aries.proxy - 1.0.2-SNAPSHOT + ${org.apache.aries.proxy.version} org.apache.aries org.apache.aries.util - 1.0.0 + ${org.apache.aries.util.version} org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.application org.apache.aries.application.default.local.platform - 1.0.0 + ${org.apache.aries.application.default.local.platform.version} org.apache.aries.application org.apache.aries.application.modeller - 1.0.0 + ${org.apache.aries.application.modeller.version} org.apache.aries.application org.apache.aries.application.resolver.obr - 1.0.0 + ${org.apache.aries.application.resolver.obr.version} org.ow2.asm asm-all - 5.0.3 + ${asm-all.version} true org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1.1 + ${geronimo-jta_1.1_spec.version} org.apache.geronimo.specs geronimo-jpa_2.0_spec - 1.1 + ${geronimo-jpa_2.0_spec.version} provided org.apache.aries.jpa org.apache.aries.jpa.api - 1.0.0 + ${org.apache.aries.jpa.api.version} provided org.apache.aries.transaction - org.apache.aries.transaction.manager - 1.0.0 + org.apache.aries.transaction.manager + ${org.apache.aries.transaction.manager.version} - + org.apache.aries.transaction - org.apache.aries.transaction.wrappers - 1.0.0 + org.apache.aries.transaction.wrappers + ${org.apache.aries.transaction.wrappers.version} - - - org.apache.aries.transaction - org.apache.aries.transaction.blueprint - 1.0.0 + + + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + ${org.apache.aries.transaction.blueprint.version} - org.apache.aries.jpa - org.apache.aries.jpa.blueprint.aries - 1.0.0 + org.apache.aries.jpa + org.apache.aries.jpa.blueprint.aries + ${org.apache.aries.jpa.blueprint.aries.version} - + @@ -214,7 +236,7 @@ maven-assembly-plugin - 2.2.1 + ${maven-assembly-plugin.version} src/main/assembly/createzip.xml @@ -222,11 +244,11 @@ - make-assembly - package - - single - + make-assembly + package + + single + diff --git a/application/application-utils/pom.xml b/application/application-utils/pom.xml index 904c257e0f..dd6505a4ae 100644 --- a/application/application-utils/pom.xml +++ b/application/application-utils/pom.xml @@ -22,10 +22,10 @@ 4.0.0 - org.apache.aries - parent - 2.0.0 - ../../parent/pom.xml + org.apache.aries + parent + 2.0.0 + ../../parent/pom.xml org.apache.aries.application @@ -34,7 +34,7 @@ Apache Aries Application Utils 1.0.1-SNAPSHOT - Utilities for working with Aries Applications. + Utilities for working with Aries Applications. @@ -51,7 +51,7 @@ org.apache.aries.application.utils.manifest; org.apache.aries.application.utils.management; org.apache.aries.application.utils.service; - org.apache.aries.application.utils.runtime + org.apache.aries.application.utils.runtime org.osgi.service.blueprint;resolution:=optional, @@ -61,9 +61,13 @@ org.apache.aries.application.impl; org.apache.aries.application.utils.internal; - org.apache.aries.application.utils.filesystem.impl + org.apache.aries.application.utils.filesystem.impl 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 @@ -71,20 +75,20 @@ org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} - org.apache.aries - org.apache.aries.util - 1.0.0 + org.apache.aries + org.apache.aries.util + ${org.apache.aries.util.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} diff --git a/async/async-all-index/pom.xml b/async/async-all-index/pom.xml index cc9d572f88..b627032262 100644 --- a/async/async-all-index/pom.xml +++ b/async/async-all-index/pom.xml @@ -25,7 +25,7 @@ org.apache.aries parent 2.0.0 - ../parent/pom.xml + ../../parent/pom.xml org.apache.aries.async @@ -34,7 +34,7 @@ pom 1.1.0-SNAPSHOT - An index for the Apache Aries Async Service (all-in-one) + An index for the Apache Aries Async Service (all-in-one) @@ -43,12 +43,14 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - REQUIRED + + 3.1.0 + 1.1.0-SNAPSHOT - - + + apache-release @@ -63,13 +65,13 @@ - + org.apache.aries.async org.apache.aries.async - 1.1.0-SNAPSHOT + ${org.apache.aries.async.version} @@ -78,7 +80,7 @@ biz.aQute.bnd bnd-indexer-maven-plugin - 3.1.0 + ${bnd-indexer-maven-plugin.version} ${local.url.policy} diff --git a/async/async-all/pom.xml b/async/async-all/pom.xml index 273b40fa0a..1a415df84b 100644 --- a/async/async-all/pom.xml +++ b/async/async-all/pom.xml @@ -44,7 +44,7 @@ - org.apache.aries.async.impl.Activator + org.apache.aries.async.impl.Activator org.apache.aries.async.promise, @@ -55,8 +55,8 @@ org.osgi.service.log - org.apache.aries.async.impl, - org.osgi.util.tracker, + org.apache.aries.async.impl, + org.osgi.util.tracker, net.sf.cglib.* @@ -71,37 +71,44 @@ * 1.0.1 + + 3.2.4 + 1.0.2-SNAPSHOT + 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.3.0 + 1.5.1 org.apache.aries.async org.apache.aries.async.promise.api - 1.1.0-SNAPSHOT + ${org.apache.aries.async.promise.api.version} provided org.apache.aries.async org.apache.aries.async.api - 1.0.2-SNAPSHOT + ${org.apache.aries.async.api.version} provided org.apache.aries.async org.apache.aries.async.impl - 1.1.0-SNAPSHOT + ${org.apache.aries.async.impl.version} provided org.osgi org.osgi.service.log - 1.3.0 + ${org.osgi.service.log.version} provided org.osgi org.osgi.util.tracker - 1.5.1 + ${org.osgi.util.tracker.version} provided @@ -110,10 +117,10 @@ provided - cglib - cglib-nodep - 3.2.4 - provided + cglib + cglib-nodep + ${cglib-nodep.version} + provided org.osgi @@ -138,14 +145,14 @@ - org.apache.felix - maven-bundle-plugin - - - osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate" - - - + org.apache.felix + maven-bundle-plugin + + + osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate" + + + diff --git a/async/async-api/pom.xml b/async/async-api/pom.xml index 297868b904..1d1912142f 100644 --- a/async/async-api/pom.xml +++ b/async/async-api/pom.xml @@ -56,13 +56,16 @@ * 1.0.1 + + 1.1.0-SNAPSHOT + 6.0.1 org.apache.aries.async org.apache.aries.async.promise.api - 1.1.0-SNAPSHOT + ${org.apache.aries.async.promise.api.version} org.osgi @@ -72,7 +75,7 @@ org.osgi osgi.annotation - 6.0.1 + ${osgi.annotation.version} provided diff --git a/async/async-impl/pom.xml b/async/async-impl/pom.xml index eb210c1961..9b77544c1c 100644 --- a/async/async-impl/pom.xml +++ b/async/async-impl/pom.xml @@ -44,13 +44,13 @@ - org.apache.aries.async.impl.Activator + org.apache.aries.async.impl.Activator - org.apache.aries.async.impl, - net.sf.cglib.* + org.apache.aries.async.impl, + net.sf.cglib.* !net.sf.cglib.asm.util, @@ -58,28 +58,36 @@ * 1.0.1 + + 3.2.4 + 1.9.5 + 1.0.2-SNAPSHOT + 1.1.0-SNAPSHOT + 1.3.0 + 1.5.1 + 6.0.1 org.apache.aries.async org.apache.aries.async.promise.api - 1.1.0-SNAPSHOT + ${org.apache.aries.async.promise.api.version} org.apache.aries.async org.apache.aries.async.api - 1.0.2-SNAPSHOT + ${org.apache.aries.async.api.version} org.osgi org.osgi.service.log - 1.3.0 + ${org.osgi.service.log.version} org.osgi org.osgi.util.tracker - 1.5.1 + ${org.osgi.util.tracker.version} org.osgi @@ -89,14 +97,14 @@ org.osgi osgi.annotation - 6.0.1 + ${osgi.annotation.version} provided - cglib - cglib-nodep - 3.2.4 - provided + cglib + cglib-nodep + ${cglib-nodep.version} + provided junit @@ -106,7 +114,7 @@ org.mockito mockito-all - 1.9.5 + ${mockito-all.version} test @@ -126,15 +134,15 @@ - - org.apache.felix - maven-bundle-plugin - - - osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate" - - - + + org.apache.felix + maven-bundle-plugin + + + osgi.service;objectClass:List<String>=org.osgi.service.async.Async;uses:=org.osgi.service.async,osgi.implementation;osgi.implementation=osgi.async;version:Version=1.0.0;uses:="org.osgi.service.async,org.osgi.service.async.delegate" + + + diff --git a/async/async-index/pom.xml b/async/async-index/pom.xml index dd42d6d22c..27ad62a226 100644 --- a/async/async-index/pom.xml +++ b/async/async-index/pom.xml @@ -25,7 +25,7 @@ org.apache.aries parent 2.0.1 - ../parent/pom.xml + ../../parent/pom.xml org.apache.aries.async @@ -34,7 +34,7 @@ pom 1.1.0-SNAPSHOT - An index for the Apache Aries Async Service + An index for the Apache Aries Async Service @@ -43,12 +43,13 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - REQUIRED + + 3.1.0 + 1.1.0-SNAPSHOT - - + apache-release @@ -63,13 +64,12 @@ - org.apache.aries.async org.apache.aries.async.impl - 1.1.0-SNAPSHOT + ${org.apache.aries.async.impl.version} @@ -78,7 +78,7 @@ biz.aQute.bnd bnd-indexer-maven-plugin - 3.1.0 + ${bnd-indexer-maven-plugin.version} ${local.url.policy} @@ -94,6 +94,5 @@ - diff --git a/async/promise-api/pom.xml b/async/promise-api/pom.xml index 48d95341cb..40b3cd88f4 100644 --- a/async/promise-api/pom.xml +++ b/async/promise-api/pom.xml @@ -50,20 +50,22 @@ org.osgi.util.promise;provide:=true, org.apache.aries.async.promise - + org.osgi.util.function, org.osgi.util.promise, * 1.0.1 + + 6.0.1 org.osgi osgi.annotation - 6.0.1 + ${osgi.annotation.version} provided diff --git a/blueprint/blueprint-api/pom.xml b/blueprint/blueprint-api/pom.xml index eb56995d99..5a55cb49d4 100644 --- a/blueprint/blueprint-api/pom.xml +++ b/blueprint/blueprint-api/pom.xml @@ -54,7 +54,7 @@ org.osgi.framework - + 1.0.0 diff --git a/blueprint/blueprint-authz/pom.xml b/blueprint/blueprint-authz/pom.xml index ad6bc840bd..30b8712492 100644 --- a/blueprint/blueprint-authz/pom.xml +++ b/blueprint/blueprint-authz/pom.xml @@ -40,12 +40,13 @@ javax.annotation.security,* org.apache.aries.blueprint.authorization.impl org.apache.aries.blueprint.authorization.impl.Activator - + true 1.0.0 1.0.0 + 1.2 @@ -73,7 +74,7 @@ javax.annotation javax.annotation-api - 1.2 + ${javax.annotation-api.version} org.apache.aries.blueprint diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index 670818b50f..57663625d7 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -104,14 +104,19 @@ 1.1.0 + 5.0.3 ${blueprint.api.dev.version} - ${blueprint.core.dev.version} + ${blueprint.authz.dev.version} ${blueprint.cm.dev.version} + ${blueprint.core.dev.version} + ${blueprint.jexl.evaluator.dev.version} ${blueprint.parser.dev.version} - ${blueprint.authz.dev.version} - ${blueprint.spring.dev.version} ${blueprint.spring.extender.dev.version} - ${blueprint.jexl.evaluator.dev.version} + ${blueprint.spring.dev.version} + 1.0.0 + 1.0.3 + 1.0.0 + 0.3.1 @@ -136,19 +141,19 @@ org.apache.aries.proxy org.apache.aries.proxy.api - 1.0.0 + ${org.apache.aries.proxy.api.version} provided org.apache.aries.proxy org.apache.aries.proxy.impl - 1.0.3 + ${org.apache.aries.proxy.impl.version} test org.ow2.asm asm-debug-all - 5.0.3 + ${asm-debug-all.version} test true @@ -161,7 +166,7 @@ org.apache.aries.quiesce org.apache.aries.quiesce.api provided - 1.0.0 + ${org.apache.aries.quiesce.api.version} org.slf4j @@ -219,11 +224,11 @@ - + org.apache.aries.versioning org.apache.aries.versioning.plugin - 0.3.1 + ${org.apache.aries.versioning.plugin.version} method org.apache.aries.blueprint.di.Repository getRepository() has been deleted diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index 92d4f068a7..eee6e5b183 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -41,25 +41,34 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - HEAD - + HEAD + - + - org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", - org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", - * + org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", + org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", + * org.apache.aries.blueprint.compendium.cm + 1.1.0 1.0.1 1.10.3 1.6.0 - 1.1.0 + 0.1.6 + 1.7.5 + 2.5.2 + 1.10.0 + 1.1.0 + 1.2.8 + 4.1.0 + 1.3.1 + 1.7.5 @@ -89,18 +98,18 @@ org.apache.aries.blueprint blueprint-parser - 1.6.0 + ${blueprint.parser.version} provided org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.10.0 + ${org.apache.aries.blueprint.core.version} - - org.apache.aries - org.apache.aries.util - + + org.apache.aries + org.apache.aries.util + @@ -112,7 +121,7 @@ org.osgi org.osgi.compendium provided - 4.1.0 + ${org.osgi.compendium.version} org.slf4j @@ -123,13 +132,13 @@ com.googlecode.pojosr de.kalpatec.pojosr.framework - 0.1.6 + ${de.kalpatec.pojosr.framework.version} test org.ops4j.pax.swissbox pax-swissbox-tinybundles - 1.3.1 + ${pax-swissbox-tinybundles.version} test @@ -140,25 +149,25 @@ org.slf4j slf4j-log4j12 - 1.7.5 + ${slf4j-log4j12.version} test org.slf4j jcl-over-slf4j - 1.7.5 + ${jcl-over-slf4j.version} test org.apache.aries.proxy org.apache.aries.proxy - 1.1.0 + ${org.apache.aries.proxy.version} test org.apache.felix org.apache.felix.configadmin - 1.2.8 + ${org.apache.felix.configadmin.version} test @@ -180,7 +189,7 @@ maven-release-plugin - 2.5.2 + ${maven-release-plugin.version} diff --git a/blueprint/blueprint-compatibility/pom.xml b/blueprint/blueprint-compatibility/pom.xml index e49f3710dd..1f38eeb8cb 100644 --- a/blueprint/blueprint-compatibility/pom.xml +++ b/blueprint/blueprint-compatibility/pom.xml @@ -138,20 +138,20 @@ ${project.build.directory}/sources - - - org.apache.aries.versioning - org.apache.aries.versioning.plugin - - - default-verify - verify - - version-check - - - - + + + org.apache.aries.versioning + org.apache.aries.versioning.plugin + + + default-verify + verify + + version-check + + + + diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index 6f94254654..52d559dd31 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -42,8 +42,8 @@ scm:git:http://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git - HEAD - + HEAD + ${project.basedir}/rat-excludes.txt @@ -93,14 +93,20 @@ {maven-resources}, org/apache/aries/blueprint/blueprint.xsd=${project.build.directory}/sources/org/osgi/service/blueprint/blueprint.xsd + 1.6.0 + + 5.0.3 1.0.1 1.0.1 1.6.0 + 4.2 + 2.5.2 + 0.3.1 + 1.11.6 1.1.1 1.1.9 1.0.0 1.1.3 - 1.6.0 @@ -163,7 +169,7 @@ org.apache.felix org.apache.felix.utils - 1.11.6 + ${org.apache.felix.utils.version} provided @@ -175,7 +181,7 @@ org.ow2.asm asm-debug-all true - 5.0.3 + ${asm-debug-all.version} org.apache.aries.quiesce @@ -185,7 +191,7 @@ org.easymock easymock - 4.2 + ${easymock.version} test @@ -242,15 +248,15 @@ - + org.apache.aries.versioning org.apache.aries.versioning.plugin - 0.3.1 + ${org.apache.aries.versioning.plugin.version} - method org.apache.aries.blueprint.di.Repository getRepository() has been deleted - class org/apache/aries/blueprint/ext/PropertyPlaceholder was not abstract but is changed to be abstract + method org.apache.aries.blueprint.di.Repository getRepository() has been deleted + class org/apache/aries/blueprint/ext/PropertyPlaceholder was not abstract but is changed to be abstract @@ -276,23 +282,23 @@ version:Version="1.0" - osgi.service;filter:="(objectClass=org.apache.aries.proxy.ProxyManager)";effective:="active" + osgi.service;filter:="(objectClass=org.apache.aries.proxy.ProxyManager)";effective:="active" maven-release-plugin - 2.5.2 + ${maven-release-plugin.version} org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - + maven-javadoc-plugin + + -Xdoclint:none + - + diff --git a/blueprint/blueprint-distro/pom.xml b/blueprint/blueprint-distro/pom.xml index 616dee4eef..0edf40b218 100644 --- a/blueprint/blueprint-distro/pom.xml +++ b/blueprint/blueprint-distro/pom.xml @@ -39,36 +39,46 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 2.2-beta-5 + 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0 + 1.0.0-SNAPSHOT + + org.apache.aries.blueprint org.apache.aries.blueprint.annotation.api - 1.0.0 + ${org.apache.aries.blueprint.annotation.api.version} org.apache.aries.blueprint org.apache.aries.blueprint.annotation.impl - 1.0.0-SNAPSHOT + ${org.apache.aries.blueprint.annotation.impl.version} org.apache.aries.blueprint org.apache.aries.blueprint.api - 1.0.0 + ${org.apache.aries.blueprint.api.version} org.apache.aries.blueprint org.apache.aries.blueprint.cm - 1.0.0-SNAPSHOT + ${org.apache.aries.blueprint.cm.version} org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.0.0 + ${org.apache.aries.blueprint.core.version} org.apache.aries.blueprint org.apache.aries.blueprint.jexl.evaluator - 1.0.0-SNAPSHOT + ${org.apache.aries.blueprint.jexl.evaluator.version} @@ -76,7 +86,7 @@ maven-assembly-plugin - 2.2-beta-5 + ${maven-assembly-plugin.version} package diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml index fa2bc2f890..725965bd2d 100644 --- a/blueprint/blueprint-jexl-evaluator/pom.xml +++ b/blueprint/blueprint-jexl-evaluator/pom.xml @@ -45,7 +45,7 @@ - + org.apache.aries.blueprint.ext.evaluator;provide:=true, org.apache.commons.jexl2, @@ -55,8 +55,10 @@ org.apache.aries.blueprint.jexl.evaluator - 1.10.0 1.0.0 + + 1.10.0 + 2.0 @@ -82,12 +84,12 @@ org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.10.0 + ${blueprint.core.version} org.apache.commons commons-jexl - 2.0 + ${commons-jexl.version} commons-logging diff --git a/blueprint/blueprint-noosgi/pom.xml b/blueprint/blueprint-noosgi/pom.xml index f41c66a621..fa2a9c0d71 100644 --- a/blueprint/blueprint-noosgi/pom.xml +++ b/blueprint/blueprint-noosgi/pom.xml @@ -44,10 +44,13 @@ + 1.6.0 1.0.1 1.10.0 1.6.0 + 1.11.6 1.0.3 + 1.7.5 @@ -83,13 +86,13 @@ org.apache.aries.blueprint blueprint-parser - 1.6.0 + ${blueprint-parser.version} provided org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.10.0 + ${blueprint.core.version} org.apache.aries.quiesce @@ -111,7 +114,7 @@ org.apache.felix org.apache.felix.utils - 1.11.6 + ${org.apache.felix.utils.version} provided @@ -127,13 +130,13 @@ org.slf4j slf4j-log4j12 - 1.7.5 + ${slf4j.version} test org.slf4j jcl-over-slf4j - 1.7.5 + ${slf4j.version} test diff --git a/blueprint/blueprint-parent/pom.xml b/blueprint/blueprint-parent/pom.xml index b22c801ef7..9515f143ea 100644 --- a/blueprint/blueprint-parent/pom.xml +++ b/blueprint/blueprint-parent/pom.xml @@ -44,23 +44,24 @@ + 0.12 + 1.3.1-SNAPSHOT + 1.0.1-SNAPSHOT + 1.1.1-SNAPSHOT + 1.0.1-SNAPSHOT 1.0.2-SNAPSHOT - 1.10.4-SNAPSHOT - 1.3.3-SNAPSHOT - 1.6.2-SNAPSHOT 1.0.1-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.3.3-SNAPSHOT + 1.10.4-SNAPSHOT 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT + 1.6.2-SNAPSHOT 1.0.1-SNAPSHOT 1.0.1-SNAPSHOT - 1.2.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.1.2-SNAPSHOT - 1.1.1-SNAPSHOT - 1.0.1-SNAPSHOT - 1.3.1-SNAPSHOT - 1.0.1-SNAPSHOT @@ -68,7 +69,7 @@ org.apache.rat apache-rat-plugin - 0.12 + ${apache-rat-plugin.version} verify diff --git a/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml index d838e30081..b4bcdd7b2c 100644 --- a/blueprint/blueprint-parser/pom.xml +++ b/blueprint/blueprint-parser/pom.xml @@ -41,12 +41,13 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - HEAD - + HEAD + - 1.0.0 1.4.0 + + 1.0.0 diff --git a/blueprint/blueprint-repository/pom.xml b/blueprint/blueprint-repository/pom.xml index 81e225dd3b..ac660474fb 100644 --- a/blueprint/blueprint-repository/pom.xml +++ b/blueprint/blueprint-repository/pom.xml @@ -32,13 +32,17 @@ 1.5.0-SNAPSHOT pom - 3.1.0 UTF-8 ALLOWED + 5.0.4 1.0.1 - 1.5.0 1.0.9 + 1.5.0 + 3.1.0 + 1.0.1 + 1.0.6 + 1.1.3 @@ -80,44 +84,44 @@ - + org.ow2.asm asm-all - 5.0.4 + ${asm-all.version} org.apache.aries org.apache.aries.util - 1.1.3 + ${org.apache.aries.util.version} org.apache.aries.proxy org.apache.aries.proxy.api - 1.0.1 + ${org.apache.aries.proxy.api.version} org.apache.aries.proxy org.apache.aries.proxy.impl - 1.0.6 + ${org.apache.aries.proxy.impl.version} - - - org.apache.aries.blueprint - org.apache.aries.blueprint.api - ${blueprint.api.version} - - - org.apache.aries.blueprint - org.apache.aries.blueprint.core - ${blueprint.core.version} - - - org.apache.aries.blueprint - org.apache.aries.blueprint.cm - ${blueprint.cm.version} - - + + + org.apache.aries.blueprint + org.apache.aries.blueprint.api + ${blueprint.api.version} + + + org.apache.aries.blueprint + org.apache.aries.blueprint.core + ${blueprint.core.version} + + + org.apache.aries.blueprint + org.apache.aries.blueprint.cm + ${blueprint.cm.version} + + diff --git a/blueprint/blueprint-spring-camel/pom.xml b/blueprint/blueprint-spring-camel/pom.xml index cf240fdf69..79f208017f 100644 --- a/blueprint/blueprint-spring-camel/pom.xml +++ b/blueprint/blueprint-spring-camel/pom.xml @@ -44,12 +44,14 @@ - 1.0.0 - 1.6.2 - 1.4.0 + + 1.0.0 + 1.6.2 + 1.4.0 + 2.19.0 @@ -74,12 +76,12 @@ org.apache.camel camel-spring - 2.19.0 + ${camel.version} org.apache.camel camel-core-osgi - 2.19.0 + ${camel.version} org.osgi diff --git a/blueprint/blueprint-spring-extender/pom.xml b/blueprint/blueprint-spring-extender/pom.xml index 17b5579964..e6246e4b4a 100644 --- a/blueprint/blueprint-spring-extender/pom.xml +++ b/blueprint/blueprint-spring-extender/pom.xml @@ -45,11 +45,11 @@ - + - org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", - org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", - * + org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", + org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", + * org.apache.aries.blueprint.spring.extender, @@ -58,12 +58,22 @@ org.apache.aries.blueprint.spring.extender.Activator - 1.0.0 - 1.6.2 - 1.4.0 + + 1.0.0 + 1.6.2 + 1.4.0 + 0.1.6 + 4.7 + 1.0.3 + 1.2.8 + 1.11.6 + 4.3.1 + 1.3.1 + 1.7.5 + 4.2.2.RELEASE @@ -110,7 +120,7 @@ org.osgi org.osgi.compendium provided - 4.3.1 + ${org.osgi.compendium.version} org.slf4j @@ -120,73 +130,73 @@ org.springframework spring-context - 4.2.2.RELEASE + ${spring.version} provided org.springframework spring-beans - 4.2.2.RELEASE + ${spring.version} provided org.apache.felix org.apache.felix.utils - 1.11.6 + ${org.apache.felix.utils.version} provided com.googlecode.pojosr de.kalpatec.pojosr.framework - 0.1.6 + ${de.kalpatec.pojosr.framework.version} test org.ops4j.pax.swissbox pax-swissbox-tinybundles - 1.3.1 + ${pax-swissbox-tinybundles.version} test junit junit - 4.7 + ${junit.version} test org.slf4j slf4j-log4j12 - 1.7.5 + ${slf4j.version} test org.slf4j jcl-over-slf4j - 1.7.5 + ${slf4j.version} test org.apache.aries.proxy org.apache.aries.proxy.impl - 1.0.3 + ${org.apache.aries.proxy.impl.version} test org.apache.felix org.apache.felix.configadmin - 1.2.8 + ${org.apache.felix.configadmin.version} test org.springframework spring-tx - 4.2.2.RELEASE + ${spring.version} test org.springframework spring-aop - 4.2.2.RELEASE + ${spring.version} test diff --git a/blueprint/blueprint-spring/pom.xml b/blueprint/blueprint-spring/pom.xml index 7ce6dcabd9..9cbb1f65a1 100644 --- a/blueprint/blueprint-spring/pom.xml +++ b/blueprint/blueprint-spring/pom.xml @@ -45,11 +45,11 @@ - + - org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", - org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", - * + org.apache.aries.blueprint;provide:=true;version="[1.0,2.0)", + org.apache.aries.blueprint.ext;provide:=true;version="[1.0,2.0)", + * org.apache.aries.blueprint.spring, @@ -58,12 +58,23 @@ org.apache.aries.blueprint.spring.Activator - 1.0.0 - 1.9.0 - 1.5.0 + + 1.0.0 + 1.9.0 + 1.5.0 + 0.1.6 + 1.0.3 + 1.2.8 + 1.11.6 + 1.3.1 + 1.7.5 + 4.2.2.RELEASE + 4.2.2.RELEASE + 4.2.2.RELEASE + 4.2.2.RELEASE @@ -119,31 +130,31 @@ org.springframework spring-context - 4.2.2.RELEASE + ${spring-context.version} provided org.springframework spring-beans - 4.2.2.RELEASE + ${spring-beans.version} provided org.apache.felix org.apache.felix.utils - 1.11.6 + ${org.apache.felix.utils.version} provided com.googlecode.pojosr de.kalpatec.pojosr.framework - 0.1.6 + ${de.kalpatec.pojosr.framework.version} test org.ops4j.pax.swissbox pax-swissbox-tinybundles - 1.3.1 + ${pax-swissbox-tinybundles.version} test @@ -154,37 +165,37 @@ org.slf4j slf4j-log4j12 - 1.7.5 + ${slf4j.version} test org.slf4j jcl-over-slf4j - 1.7.5 + ${slf4j.version} test org.apache.aries.proxy org.apache.aries.proxy.impl - 1.0.3 + ${org.apache.aries.proxy.impl.version} test org.apache.felix org.apache.felix.configadmin - 1.2.8 + ${org.apache.felix.configadmin.version} test org.springframework spring-tx - 4.2.2.RELEASE + ${spring-tx.version} test org.springframework spring-aop - 4.2.2.RELEASE + ${spring-aop.version} test diff --git a/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index 297111dada..9e0feed7bd 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -49,12 +49,14 @@ org.apache.aries.blueprint.web - org.osgi.framework, - org.osgi.service.blueprint.container;provide:=true, - org.apache.aries.blueprint.services;provide:=true;version="[1.2,2.0)", - javax.servlet*;version="[0.0,4)" + org.osgi.framework, + org.osgi.service.blueprint.container;provide:=true, + org.apache.aries.blueprint.services;provide:=true;version="[1.2,2.0)", + javax.servlet*;version="[0.0,4)" + 1.3.0 + 1.2 @@ -84,7 +86,7 @@ org.apache.geronimo.specs geronimo-servlet_2.5_spec - 1.2 + ${geronimo-servlet_2.5_spec.version} provided @@ -93,19 +95,19 @@ provided - + - - - - org.apache.maven.plugins - maven-release-plugin - - forked-path - - - - + + + + org.apache.maven.plugins + maven-release-plugin + + forked-path + + + + diff --git a/blueprint/blueprint-web/pom.xml b/blueprint/blueprint-web/pom.xml index e8f38a5871..98239401a0 100644 --- a/blueprint/blueprint-web/pom.xml +++ b/blueprint/blueprint-web/pom.xml @@ -45,10 +45,12 @@ + 1.1.1 + + 1.1.0 1.2.0-SNAPSHOT 1.5.0 - 1.1.0 - 1.1.1 + 1.2 @@ -85,7 +87,7 @@ org.apache.geronimo.specs geronimo-servlet_2.5_spec - 1.2 + ${geronimo-servlet_2.5_spec.version} provided @@ -135,7 +137,7 @@ - + org.apache.aries.versioning org.apache.aries.versioning.plugin @@ -151,5 +153,5 @@ - + diff --git a/blueprint/examples/blueprint-sample-fragment/pom.xml b/blueprint/examples/blueprint-sample-fragment/pom.xml index a17fff545b..d6c45976c2 100644 --- a/blueprint/examples/blueprint-sample-fragment/pom.xml +++ b/blueprint/examples/blueprint-sample-fragment/pom.xml @@ -51,9 +51,11 @@ org.apache.aries.blueprint.annotation;provide:=true, * - + 1.0.1 + 1.0.0 + 3.5.0.v20090520 @@ -69,7 +71,7 @@ org.eclipse osgi - 3.5.0.v20090520 + ${osgi.version} provided @@ -80,7 +82,7 @@ org.apache.aries.blueprint org.apache.aries.blueprint.annotation.api - 1.0.0 + ${org.apache.aries.blueprint.annotation.api.version} diff --git a/blueprint/examples/blueprint-sample-war/pom.xml b/blueprint/examples/blueprint-sample-war/pom.xml index 30e89288d7..e9e6889ce1 100644 --- a/blueprint/examples/blueprint-sample-war/pom.xml +++ b/blueprint/examples/blueprint-sample-war/pom.xml @@ -46,7 +46,13 @@ / 8080 + 1.0.0 + 1.2 + 8.1.8.v20121106 + 2.3 + 2.0 + 2.0 @@ -62,7 +68,7 @@ org.apache.geronimo.specs geronimo-servlet_2.5_spec - 1.2 + ${geronimo-servlet_2.5_spec.version} provided @@ -81,7 +87,7 @@ org.mortbay.jetty jetty-maven-plugin - 8.1.8.v20121106 + ${jetty-maven-plugin.version} 1 true @@ -106,7 +112,7 @@ org.apache.tomcat.maven tomcat7-maven-plugin - 2.0 + ${tomcat7-maven-plugin.version} ${httpPort} ${context} @@ -119,7 +125,7 @@ org.apache.tomcat.maven tomcat6-maven-plugin - 2.0 + ${tomcat6-maven-plugin.version} ${httpPort} ${context} @@ -132,7 +138,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + ${maven-war-plugin.version} diff --git a/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index c1c0029089..3a3399648c 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/pom.xml @@ -55,7 +55,7 @@ org.osgi.service.blueprint, org.osgi.service.blueprint.container - + 1.0.0 @@ -70,11 +70,11 @@ - - org.osgi - org.osgi.core - provided - + + org.osgi + org.osgi.core + provided + org.apache.aries.blueprint org.apache.aries.blueprint.api diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index fdde354c47..8a62614adc 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -42,26 +42,38 @@ - 4.10.0 - 2.5.3 - + 5.0.3 ${blueprint.api.dev.version} - ${blueprint.core.dev.version} - ${blueprint.cm.dev.version} - ${blueprint.parser.dev.version} ${blueprint.authz.dev.version} - ${blueprint.spring.dev.version} - ${blueprint.spring.extender.dev.version} + ${blueprint.cm.dev.version} + ${blueprint.core.dev.version} ${blueprint.jexl.evaluator.dev.version} - ${blueprint.sample.dev.version} + ${blueprint.parser.dev.version} ${blueprint.sample.fragment.dev.version} + ${blueprint.sample.dev.version} + ${blueprint.spring.extender.dev.version} + ${blueprint.spring.dev.version} + 2.0 + 1.4.0 + 4.10.0 + 1.1.0 + 1.0.0 + 2.0.0-SNAPSHOT + 1.8.0 + 1.0_6 + 4.2.2.RELEASE_1 + 3.11.3 + 1.7.7 + 2.0.0 + 2.5.3 + 3.18 org.eclipse.platform org.eclipse.osgi - 3.11.3 + ${org.eclipse.osgi.version} provided @@ -92,54 +104,54 @@ org.apache.aries.proxy org.apache.aries.proxy - 1.1.0 + ${org.apache.aries.proxy.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-context - 4.2.2.RELEASE_1 + ${org.apache.servicemix.bundles.spring.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-tx - 4.2.2.RELEASE_1 + ${org.apache.servicemix.bundles.spring.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-context-support - 4.2.2.RELEASE_1 + ${org.apache.servicemix.bundles.spring.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-beans - 4.2.2.RELEASE_1 + ${org.apache.servicemix.bundles.spring.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-aop - 4.2.2.RELEASE_1 + ${org.apache.servicemix.bundles.spring.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-core - 4.2.2.RELEASE_1 + ${org.apache.servicemix.bundles.spring.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-expression - 4.2.2.RELEASE_1 + ${org.apache.servicemix.bundles.spring.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.aopalliance - 1.0_6 + ${org.apache.servicemix.bundles.aopalliance.version} org.apache.aries.quiesce org.apache.aries.quiesce.api bundle provided - 1.0.0 + ${org.apache.aries.quiesce.api.version} org.apache.aries.blueprint @@ -170,7 +182,7 @@ org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} org.apache.aries.blueprint @@ -212,7 +224,7 @@ org.slf4j slf4j-api - 1.7.7 + ${slf4j.version} org.ops4j.pax.exam @@ -247,7 +259,7 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} junit @@ -259,28 +271,28 @@ org.apache.felix org.apache.felix.configadmin test - 1.8.0 + ${org.apache.felix.configadmin.version} org.ow2.asm asm-debug-all test - 5.0.3 + ${asm-debug-all.version} org.apache.xbean xbean-asm5-shaded - 3.18 + ${xbean.version} org.apache.xbean xbean-bundleutils - 3.18 + ${xbean.version} org.apache.xbean xbean-finder - 3.18 + ${xbean.version} org.apache.aries.blueprint @@ -304,7 +316,7 @@ org.apache.commons commons-jexl - 2.0 + ${commons-jexl.version} test @@ -337,7 +349,7 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.4.0 + ${depends-maven-plugin.version} generate-depends-file diff --git a/blueprint/itests/blueprint-testbundlea/pom.xml b/blueprint/itests/blueprint-testbundlea/pom.xml index 5d0e5eb588..008e589c4a 100644 --- a/blueprint/itests/blueprint-testbundlea/pom.xml +++ b/blueprint/itests/blueprint-testbundlea/pom.xml @@ -38,7 +38,7 @@ org.apache.aries.blueprint.testbundlea.Activator - + ${project.artifactId}* diff --git a/blueprint/itests/blueprint-testbundleb/pom.xml b/blueprint/itests/blueprint-testbundleb/pom.xml index 2565a8d08c..f1c2430ebf 100644 --- a/blueprint/itests/blueprint-testbundleb/pom.xml +++ b/blueprint/itests/blueprint-testbundleb/pom.xml @@ -38,7 +38,7 @@ org.apache.aries.blueprint.testbundleb.Activator - + ${project.artifactId}* diff --git a/blueprint/itests/blueprint-testbundlee/pom.xml b/blueprint/itests/blueprint-testbundlee/pom.xml index 8eeef443b7..1633f02109 100644 --- a/blueprint/itests/blueprint-testbundlee/pom.xml +++ b/blueprint/itests/blueprint-testbundlee/pom.xml @@ -35,21 +35,23 @@ Blueprint Test Bundle E, provides Spring Extender test - + ${project.artifactId}* + + 4.2.2.RELEASE org.springframework spring-context - 4.2.2.RELEASE + ${spring.version} provided org.springframework spring-tx - 4.2.2.RELEASE + ${spring.version} provided diff --git a/blueprint/itests/blueprint-testbundles/pom.xml b/blueprint/itests/blueprint-testbundles/pom.xml index eaf3fb94eb..a6139b121d 100644 --- a/blueprint/itests/blueprint-testbundles/pom.xml +++ b/blueprint/itests/blueprint-testbundles/pom.xml @@ -35,21 +35,23 @@ Blueprint Test Bundle S, provides Spring test - + ${project.artifactId}* + + 4.2.2.RELEASE org.springframework spring-context - 4.2.2.RELEASE + ${spring.version} provided org.springframework spring-tx - 4.2.2.RELEASE + ${spring.version} provided diff --git a/blueprint/itests/blueprint-testquiescebundle/pom.xml b/blueprint/itests/blueprint-testquiescebundle/pom.xml index 8466805ef4..251b297dd5 100644 --- a/blueprint/itests/blueprint-testquiescebundle/pom.xml +++ b/blueprint/itests/blueprint-testquiescebundle/pom.xml @@ -42,7 +42,7 @@ org.osgi.framework, org.osgi.service.blueprint - + ${project.artifactId}* diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml index bd3f0b54bf..cdabe1ef98 100644 --- a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml @@ -41,11 +41,19 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 1.8 + 1.8 + + 5.0.0 + 7.0.0 + + org.osgi osgi.annotation - 7.0.0 + ${osgi.annotation.version} provided @@ -55,21 +63,21 @@ maven-compiler-plugin - 1.8 - 1.8 + ${java.source.version} + ${java.target.version} org.apache.maven.plugins maven-javadoc-plugin - 1.8 + ${java.source.version} biz.aQute.bnd bnd-maven-plugin - 5.0.0 + ${bnd-maven-plugin.version} prepare-package diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml index 6689887d78..be7978e316 100644 --- a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml @@ -35,7 +35,11 @@ Apache Aries Blueprint Maven Plugin iTest + 1.7 + 1.7 + 1.9.1-SNAPSHOT + 1.10 @@ -49,8 +53,8 @@ maven-compiler-plugin - 1.7 - 1.7 + ${java.target.version} + ${java.source.version} @@ -64,7 +68,7 @@ org.apache.maven.plugins maven-invoker-plugin - 1.10 + ${maven-invoker-plugin.version} src/it diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml index 20f383b94f..995526c4d3 100644 --- a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml @@ -34,10 +34,12 @@ Apache Aries Blueprint Maven Plugin Pax Cdi Handlers - 0.8.0 - 19.0 + 1.7 + 1.7 1.0.0 + 19.0 + 0.8.0 @@ -60,8 +62,8 @@ maven-compiler-plugin - 1.7 - 1.7 + ${java.target.version} + ${java.source.version} diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml index 27ecfaea1f..bc9cb7c684 100644 --- a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml @@ -39,13 +39,18 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 1.7 + 1.7 + + maven-compiler-plugin - 1.7 - 1.7 + ${java.target.version} + ${java.source.version} diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml index 7b4b0f0e86..5833e660f8 100644 --- a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml @@ -38,22 +38,28 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 1.7 + 1.7 + + 1.0.0 + 2.6 + 19.0 + 3.1.4.RELEASE + + maven-compiler-plugin - 1.7 - 1.7 + ${java.target.version} + ${java.source.version} - - 1.0.0 - - dev @@ -73,7 +79,7 @@ org.springframework spring-context - 3.1.4.RELEASE + ${spring.version} spring-aop @@ -96,18 +102,18 @@ org.springframework spring-tx - 3.1.4.RELEASE + ${spring.version} commons-lang commons-lang - 2.6 + ${commons-lang.version} com.google.guava guava - 19.0 + ${guava.version} diff --git a/blueprint/plugin/blueprint-maven-plugin/pom.xml b/blueprint/plugin/blueprint-maven-plugin/pom.xml index 046efb1b7e..7970d2493a 100644 --- a/blueprint/plugin/blueprint-maven-plugin/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin/pom.xml @@ -38,36 +38,35 @@ - 3.0.5 - 1.11 - 3.4 - 1.0.0 + 1.7 + 1.7 - 1.1.0 - 1.0.0 + 1.11 1.3.0 1.0.0 - + 1.1.0 + 1.0.0 + 1.2 + 1.3.2 1 1.2 1.2-b03 - 1.2 - 1.0.2 - - 2.6 - 1.7.7 + 1.0.0 1.0-beta-4 - 0.0.7 - 3.0 - 6.0.0 - 4.9 - + 3.4 + 3.0.5 1.0.1 - 1.7.1 1.0.9 - 1.1.1 + 1.7.1 1.0.2 - 1.3.2 + 1.1.1 + 6.0.0 + 1.0.2 + 0.0.7 + 3.0 + 1.7.7 + 2.6 + 4.9 @@ -97,8 +96,8 @@ maven-compiler-plugin - 1.7 - 1.7 + ${java.source.version} + ${java.target.version} @@ -168,7 +167,7 @@ - + @@ -234,7 +233,6 @@ ${javax.annotation-api.version} - org.apache.aries.blueprint blueprint-maven-plugin-annotation diff --git a/eba-maven-plugin/pom.xml b/eba-maven-plugin/pom.xml index a52f7326b1..151676e937 100644 --- a/eba-maven-plugin/pom.xml +++ b/eba-maven-plugin/pom.xml @@ -27,7 +27,7 @@ 2.0.1 ../parent/pom.xml - + eba-maven-plugin 1.0.1-SNAPSHOT maven-plugin @@ -40,62 +40,77 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + + 0.0.357 + 2.3 + 2.0.4 + 2.0.0 + 1.4 + 2.0.7 + 2.0 + 1.1 + 2.0 + 1.0-alpha-7 + 1.0-alpha-9-stable-1 + 1.4.7 + + biz.aQute bndlib - 0.0.357 + ${bndlib.version} org.apache.felix maven-bundle-plugin - 2.0.0 + ${maven-bundle-plugin.version} org.apache.maven maven-plugin-api - 2.0 + ${maven-plugin-api.version} org.apache.maven maven-project - 2.0 + ${maven-project.version} org.apache.maven maven-artifact - 2.0.4 + ${maven-artifact.version} org.apache.maven maven-archiver - 2.3 + ${maven-archiver.version} org.apache.maven maven-model - 2.0.7 + ${maven-model.version} org.codehaus.plexus plexus-archiver - 1.0-alpha-7 + ${plexus-archiver.version} org.codehaus.plexus plexus-utils - 1.4.7 + ${plexus-utils.version} org.codehaus.plexus plexus-container-default - 1.0-alpha-9-stable-1 + ${plexus-container-default.version} org.apache.maven.shared maven-plugin-testing-harness - 1.1 + ${maven-plugin-testing-harness.version} test @@ -107,7 +122,7 @@ maven-invoker-plugin - 1.4 + ${maven-invoker-plugin.version} true src/it diff --git a/ejb/ejb-modeller-itest/pom.xml b/ejb/ejb-modeller-itest/pom.xml index a4df3e904a..68e170ef85 100644 --- a/ejb/ejb-modeller-itest/pom.xml +++ b/ejb/ejb-modeller-itest/pom.xml @@ -33,28 +33,72 @@ 1.0.1-SNAPSHOT Aries EJB Modelling iTests - - scm:git:https://gitbox.apache.org/repos/asf/aries.git - scm:git:https://gitbox.apache.org/repos/asf/aries.git - https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + scm:git:https://gitbox.apache.org/repos/asf/aries.git + scm:git:https://gitbox.apache.org/repos/asf/aries.git + https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + - 1.1.1 - 3.16 - 3.4.0 - 1.6.0 - - - 4.0.0-beta-1 - 3.0 + 1.0.0 + 4.0 + 1.8.3 + 1.2 + 2.6 + 3.3.2 + 1.2 + 3.4.0 + 1.1 + 1.0.1 + 1.0.2 + 1.0.2 + 1.0 + 1.0 + 1.0.1 + 1.0 + 1.1 + 1.0.1 + 2.1 + 1.0 + 1.1 + 1.0 + 1.1 + 1.0 + 1.1.1 + 1.1 + 1.0 + 1.1 + 1.1 + 1.1.2 + 3.0 + 2.2.4 + + 4.0.0-beta-1 + 1.1.1 + 1.0.0 + 1.0.1-SNAPSHOT + 1.0.0 + 1.3.0-SNAPSHOT + 1.0.0 + 1.0.0 + 2.0.0-SNAPSHOT + 1.0.0 + 3.2.1_3 + 3.12.1.ga_1 + 2.2.1.1_2 + 4.0-m1 + 3.8.0.v20120529-1548 + 1.0.2_1 + 2.0.0 + 1.6.0 + 3.16 - + - + org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} org.osgi @@ -64,70 +108,70 @@ org.apache.aries org.apache.aries.util - 1.0.0 + ${org.apache.aries.util.version} test org.apache.aries.proxy org.apache.aries.proxy - 1.0.0 + ${org.apache.aries.proxy.version} test - org.ow2.asm + org.ow2.asm asm-all - 4.0 + ${asm-all.version} test org.apache.aries.blueprint org.apache.aries.blueprint - 1.3.0-SNAPSHOT + ${org.apache.aries.blueprint.version} test - + - org.apache.aries.testsupport - org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT - test - + org.apache.aries.testsupport + org.apache.aries.testsupport.unit + ${org.apache.aries.testsupport.unit.version} + test + - org.apache.aries.application - org.apache.aries.application.api - 1.0.0 - bundle - test + org.apache.aries.application + org.apache.aries.application.api + ${org.apache.aries.application.api.version} + bundle + test - org.apache.aries.application - org.apache.aries.application.modeller - 1.0.1-SNAPSHOT - bundle - test + org.apache.aries.application + org.apache.aries.application.modeller + ${org.apache.aries.application.modeller.version} + bundle + test org.apache.aries.application application-modeller-standalone - 1.0.0 + ${application-modeller-standalone.version} bundle test - org.apache.aries.application - org.apache.aries.application.utils - 1.0.0 + org.apache.aries.application + org.apache.aries.application.utils + ${org.apache.aries.application.utils.version} - org.apache.aries.ejb - org.apache.aries.ejb.modeller - 1.0.0 + org.apache.aries.ejb + org.apache.aries.ejb.modeller + ${org.apache.aries.ejb.modeller.version} - org.apache.openejb - openejb-core - ${openejb.version} - + org.apache.openejb + openejb-core + ${openejb.version} + org.apache.openejb javaee-api @@ -137,273 +181,273 @@ slf4j-log4j12 - - - org.apache.openejb - openejb-api - ${openejb.version} - - - org.apache.openejb - openejb-javaagent - ${openejb.version} - - - org.apache.openejb - openejb-jee - ${openejb.version} - pom - - - org.apache.openejb - openejb-loader - ${openejb.version} - pom - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.javassist - 3.12.1.ga_1 - - - org.apache.geronimo.specs - geronimo-annotation_1.1_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-ejb_3.1_spec - 1.0.2 - - - org.apache.geronimo.specs - geronimo-jcdi_1.0_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-el_2.2_spec - 1.0.2 - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 - - - org.apache.geronimo.specs - geronimo-jaxrpc_1.1_spec - 2.1 - - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-jsp_2.2_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-interceptor_1.1_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-saaj_1.3_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.1_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.6_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-jacc_1.4_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-validation_1.0_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-jaxrs_1.1_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - 1.1.2 - - - org.apache.geronimo.specs - geronimo-jaspic_1.0_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-stax-api_1.2_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - 1.1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.wsdl4j-1.6.1 - 4.0-m1 - bundle - test - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.jaxb-impl - 2.2.1.1_2 - - - commons-cli - commons-cli - 1.2 - - - commons-lang - commons-lang - 2.6 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - org.apache.geronimo.components - geronimo-connector - ${geronimo.version} - bundle - compile - - - org.apache.geronimo.components - geronimo-transaction - ${geronimo.version} - bundle - compile - - - - org.apache.openwebbeans - openwebbeans-spi - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-impl - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-ee - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-ejb - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-web - ${openWebBeansVersion} - jar - test - - - org.apache.geronimo.bundles - scannotation - 1.0.2_1 - - - - org.apache.xbean - xbean-asm-shaded - ${xbeansVersion} - bundle - test - - - org.apache.xbean - xbean-finder-shaded - ${xbeansVersion} - bundle - test - - - org.apache.xbean - xbean-naming - ${xbeansVersion} - bundle - test - - - org.apache.xbean - xbean-reflect - ${xbeansVersion} - bundle - test - - - commons-beanutils - commons-beanutils - 1.8.3 - jar - test - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-collections - 3.2.1_3 - + + + org.apache.openejb + openejb-api + ${openejb.version} + + + org.apache.openejb + openejb-javaagent + ${openejb.version} + + + org.apache.openejb + openejb-jee + ${openejb.version} + pom + + + org.apache.openejb + openejb-loader + ${openejb.version} + pom + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.javassist + ${org.apache.servicemix.bundles.javassist.version} + + + org.apache.geronimo.specs + geronimo-annotation_1.1_spec + ${geronimo-annotation_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-ejb_3.1_spec + ${geronimo-ejb_3.1_spec.version} + + + org.apache.geronimo.specs + geronimo-jcdi_1.0_spec + ${geronimo-jcdi_1.0_spec.version} + + + org.apache.geronimo.specs + geronimo-el_2.2_spec + ${geronimo-el_2.2_spec.version} + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + ${geronimo-jta_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxrpc_1.1_spec + ${geronimo-jaxrpc_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + ${geronimo-servlet_3.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jsp_2.2_spec + ${geronimo-jsp_2.2_spec.version} + + + org.apache.geronimo.specs + geronimo-interceptor_1.1_spec + ${geronimo-interceptor_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-saaj_1.3_spec + ${geronimo-saaj_1.3_spec.version} + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + ${geronimo-activation_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-j2ee-management_1.1_spec + ${geronimo-j2ee-management_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + ${geronimo-jpa_2.0_spec.version} + + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.6_spec + ${geronimo-j2ee-connector_1.6_spec.version} + + + org.apache.geronimo.specs + geronimo-jacc_1.4_spec + ${geronimo-jacc_1.4_spec.version} + + + org.apache.geronimo.specs + geronimo-validation_1.0_spec + ${geronimo-validation_1.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxrs_1.1_spec + ${geronimo-jaxrs_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + ${geronimo-ws-metadata_2.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jaspic_1.0_spec + ${geronimo-jaspic_1.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxb_2.2_spec + ${geronimo-jaxb_2.2_spec.version} + + + org.apache.geronimo.specs + geronimo-stax-api_1.2_spec + ${geronimo-stax-api_1.2_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxws_2.2_spec + ${geronimo-jaxws_2.2_spec.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.wsdl4j-1.6.1 + ${org.apache.servicemix.bundles.wsdl4j-1.6.1.version} + bundle + test + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.jaxb-impl + ${org.apache.servicemix.bundles.jaxb-impl.version} + + + commons-cli + commons-cli + ${commons-cli.version} + + + commons-lang + commons-lang + ${commons-lang.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.geronimo.components + geronimo-connector + ${geronimo.version} + bundle + compile + + + org.apache.geronimo.components + geronimo-transaction + ${geronimo.version} + bundle + compile + - - org.hsqldb - hsqldb - 2.2.4 - + + org.apache.openwebbeans + openwebbeans-spi + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-impl + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-ee + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-ejb + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-web + ${openWebBeansVersion} + jar + test + + + org.apache.geronimo.bundles + scannotation + ${scannotation.version} + + + + org.apache.xbean + xbean-asm-shaded + ${xbeansVersion} + bundle + test + + + org.apache.xbean + xbean-finder-shaded + ${xbeansVersion} + bundle + test + + + org.apache.xbean + xbean-naming + ${xbeansVersion} + bundle + test + + + org.apache.xbean + xbean-reflect + ${xbeansVersion} + bundle + test + + + commons-beanutils + commons-beanutils + ${commons-beanutils.version} + jar + test + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.commons-collections + ${org.apache.servicemix.bundles.commons-collections.version} + + + + org.hsqldb + hsqldb + ${hsqldb.version} + @@ -440,22 +484,22 @@ ${url.version} test - - - - - - - - - - - - + + + + + + + + + + + + org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} org.osgi.core @@ -472,10 +516,10 @@ - + org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file @@ -490,7 +534,7 @@ maven-surefire-plugin pertest - + true diff --git a/ejb/ejb-modeller/pom.xml b/ejb/ejb-modeller/pom.xml index 41602cfb5d..1e75a8c6e6 100644 --- a/ejb/ejb-modeller/pom.xml +++ b/ejb/ejb-modeller/pom.xml @@ -41,37 +41,44 @@ - - org.apache.aries.ejb.modelling - + + org.apache.aries.ejb.modelling + - org.apache.aries.ejb.modelling.* + org.apache.aries.ejb.modelling.* - - org.apache.openejb.*;resolution:=optional, - org.apache.xbean.*;resolution:=optional, - org.apache.aries.application.modelling;provide:=true, - org.apache.aries.util.filesystem;provide:=true, - * + + org.apache.openejb.*;resolution:=optional, + org.apache.xbean.*;resolution:=optional, + org.apache.aries.application.modelling;provide:=true, + org.apache.aries.util.filesystem;provide:=true, + * 1.0.0 + + 6.0-1 + 4.0.0-beta-1 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 - - org.apache.aries.application - org.apache.aries.application.api - 1.0.0 - - - org.apache.aries - org.apache.aries.util - 1.0.0 - - - org.apache.openejb - openejb-core - 4.0.0-beta-1 + + org.apache.aries.application + org.apache.aries.application.api + ${org.apache.aries.application.api.version} + + + org.apache.aries + org.apache.aries.util + ${org.apache.aries.util.version} + + + org.apache.openejb + openejb-core + ${openejb-core.version} org.apache.openejb @@ -82,18 +89,18 @@ slf4j-log4j12 - - - org.osgi - org.osgi.core - provided - - - org.apache.aries.application - org.apache.aries.application.utils - 1.0.0 - - + + + org.osgi + org.osgi.core + provided + + + org.apache.aries.application + org.apache.aries.application.utils + ${org.apache.aries.application.utils.version} + + org.slf4j slf4j-api provided @@ -104,19 +111,19 @@ test - org.apache.aries.testsupport - org.apache.aries.testsupport.unit - 1.0.0 - test + org.apache.aries.testsupport + org.apache.aries.testsupport.unit + ${org.apache.aries.testsupport.unit.version} + test org.apache.openejb javaee-api - 6.0-1 + ${javaee-api.version} test - + diff --git a/ejb/openejb-extender-itest/pom.xml b/ejb/openejb-extender-itest/pom.xml index d8d39b1673..8d393686f0 100644 --- a/ejb/openejb-extender-itest/pom.xml +++ b/ejb/openejb-extender-itest/pom.xml @@ -33,29 +33,86 @@ 1.0.1-SNAPSHOT Aries EJB Extender iTests - - scm:git:https://gitbox.apache.org/repos/asf/aries.git - scm:git:https://gitbox.apache.org/repos/asf/aries.git - https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + scm:git:https://gitbox.apache.org/repos/asf/aries.git + scm:git:https://gitbox.apache.org/repos/asf/aries.git + https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + - 1.1.1 - 3.8 + 4.0 + 1.8.3 + 1.2 + 3.2.2 + 2.6 + 1.5.3 + 1.2 + 10.10.2.0 + 1.1 + 1.0.1 + 1.0 + 3.0 + 1.0.2 + 1.0.2 + 1.0 + 1.0 + 1.0.1 + 1.0 + 1.1 + 1.0.1 + 2.1 + 1.0 + 1.1 + 1.0 + 1.1.1 + 1.1 + 1.0 + 1.1.1 + 1.1 + 1.0 + 1.1 + 3.0 + 1.1 + 1.1.2 + 2.2.4 + 1.1.1 + 4.0.0-beta-1 + 2.2.2 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 2.0.0-SNAPSHOT + 1.0.0 + 1.0.0 + 3.12.1.ga_1 + 2.2.1.1_2 + 1.13.1_2 + 4.0-m1 + 3.8.0.v20120529-1548 + 4.2.0 + 3.4.0 + 1.7.2 + 1.7.2 + 1.6.0 + 1.0.2_1 + 3.8 - + org.osgi org.osgi.enterprise - 4.2.0 + ${org.osgi.enterprise.version} org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} test @@ -68,13 +125,13 @@ org.ops4j.pax.logging pax-logging-api - 1.7.2 + ${pax-logging-api.version} test org.ops4j.pax.logging pax-logging-service - 1.7.2 + ${pax-logging-service.version} test @@ -82,402 +139,402 @@ org.ops4j.pax.exam pax-exam - 3.4.0 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-container-forked - 3.4.0 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-junit4 - 3.4.0 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-link-mvn - 3.4.0 + ${pax-exam.version} test org.ops4j.pax.url pax-url-aether - 1.6.0 + ${pax-url-aether.version} test org.apache.aries org.apache.aries.util - 1.0.0 + ${org.apache.aries.util.version} test org.apache.aries.proxy org.apache.aries.proxy - 1.0.0 + ${org.apache.aries.proxy.version} test org.ow2.asm asm-all - 4.0 + ${asm-all.version} test org.apache.aries.blueprint org.apache.aries.blueprint - 1.0.0 + ${org.apache.aries.blueprint.version} test org.apache.aries.transaction org.apache.aries.transaction.manager - 1.0.0 + ${org.apache.aries.transaction.manager.version} test org.apache.aries.testsupport org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT - test - - - org.apache.aries.ejb - org.apache.aries.ejb.openejb.extender - 1.0.0 - bundle - test - - - org.apache.aries.jpa - org.apache.aries.jpa.api - 1.0.0 - bundle - compile - - - org.apache.aries.jpa - org.apache.aries.jpa.container - 1.0.0 - test - - - org.apache.aries.jpa - org.apache.aries.jpa.container.context - 1.0.0 - - - org.apache.openejb - openejb-core - 4.0.0-beta-1 - jar - test - - - org.apache.openejb - openejb-api - 4.0.0-beta-1 - jar - test - - - org.apache.openejb - openejb-javaagent - 4.0.0-beta-1 - jar - test - - - org.apache.openejb - openejb-jee - 4.0.0-beta-1 - pom - test - - - org.apache.openejb - openejb-loader - 4.0.0-beta-1 - pom - test - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.javassist - 3.12.1.ga_1 - - - org.apache.geronimo.specs - geronimo-annotation_1.1_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-ejb_3.1_spec - 1.0.2 - - - org.apache.geronimo.specs - geronimo-jcdi_1.0_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-el_2.2_spec - 1.0.2 - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 - - - org.apache.geronimo.specs - geronimo-jaxrpc_1.1_spec - 2.1 - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-jsp_2.2_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-interceptor_1.1_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-saaj_1.3_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.1_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.6_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-jacc_1.4_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-validation_1.0_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-jaxrs_1.1_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - 1.1.2 - - - org.apache.geronimo.specs - geronimo-jaspic_1.0_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-stax-api_1.2_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1.1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.wsdl4j-1.6.1 - 4.0-m1 - bundle - test - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.jaxb-impl - 2.2.1.1_2 - - - commons-cli - commons-cli - 1.2 - - + ${org.apache.aries.testsupport.unit.version} + test + + + org.apache.aries.ejb + org.apache.aries.ejb.openejb.extender + ${org.apache.aries.ejb.openejb.extender.version} + bundle + test + + + org.apache.aries.jpa + org.apache.aries.jpa.api + ${org.apache.aries.jpa.api.version} + bundle + compile + + + org.apache.aries.jpa + org.apache.aries.jpa.container + ${org.apache.aries.jpa.container.version} + test + + + org.apache.aries.jpa + org.apache.aries.jpa.container.context + ${org.apache.aries.jpa.container.context.version} + + + org.apache.openejb + openejb-core + ${openejb.version} + jar + test + + + org.apache.openejb + openejb-api + ${openejb.version} + jar + test + + + org.apache.openejb + openejb-javaagent + ${openejb.version} + jar + test + + + org.apache.openejb + openejb-jee + ${openejb.version} + pom + test + + + org.apache.openejb + openejb-loader + ${openejb.version} + pom + test + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.javassist + ${org.apache.servicemix.bundles.javassist.version} + + + org.apache.geronimo.specs + geronimo-annotation_1.1_spec + ${geronimo-annotation_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-ejb_3.1_spec + ${geronimo-ejb_3.1_spec.version} + + + org.apache.geronimo.specs + geronimo-jcdi_1.0_spec + ${geronimo-jcdi_1.0_spec.version} + + + org.apache.geronimo.specs + geronimo-el_2.2_spec + ${geronimo-el_2.2_spec.version} + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + ${geronimo-jta_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxrpc_1.1_spec + ${geronimo-jaxrpc_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + ${geronimo-atinject_1.0_spec.version} + + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + ${geronimo-servlet_3.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jsp_2.2_spec + ${geronimo-jsp_2.2_spec.version} + + + org.apache.geronimo.specs + geronimo-interceptor_1.1_spec + ${geronimo-interceptor_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-saaj_1.3_spec + ${geronimo-saaj_1.3_spec.version} + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + ${geronimo-activation_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-j2ee-management_1.1_spec + ${geronimo-j2ee-management_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + ${geronimo-jpa_2.0_spec.version} + + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.6_spec + ${geronimo-j2ee-connector_1.6_spec.version} + + + org.apache.geronimo.specs + geronimo-jacc_1.4_spec + ${geronimo-jacc_1.4_spec.version} + + + org.apache.geronimo.specs + geronimo-validation_1.0_spec + ${geronimo-validation_1.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxrs_1.1_spec + ${geronimo-jaxrs_1.1_spec.version} + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + ${geronimo-ws-metadata_2.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jaspic_1.0_spec + ${geronimo-jaspic_1.0_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxb_2.2_spec + ${geronimo-jaxb_2.2_spec.version} + + + org.apache.geronimo.specs + geronimo-stax-api_1.2_spec + ${geronimo-stax-api_1.2_spec.version} + + + org.apache.geronimo.specs + geronimo-jaxws_2.2_spec + ${geronimo-jaxws_2.2_spec.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${geronimo-jms_1.1_spec.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.wsdl4j-1.6.1 + ${org.apache.servicemix.bundles.wsdl4j-1.6.1.version} + bundle + test + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.jaxb-impl + ${org.apache.servicemix.bundles.jaxb-impl.version} + + + commons-cli + commons-cli + ${commons-cli.version} + + commons-lang commons-lang - 2.6 - - - org.apache.geronimo.components - geronimo-connector - 3.0 - bundle - compile - - - org.apache.geronimo.components - geronimo-transaction - 3.0 - bundle - compile - - - - org.apache.openwebbeans - openwebbeans-spi - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-impl - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-ee - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-ejb - ${openWebBeansVersion} - jar - test - - - org.apache.openwebbeans - openwebbeans-web - ${openWebBeansVersion} - jar - test - - - org.apache.geronimo.bundles - scannotation - 1.0.2_1 - - - - org.apache.xbean - xbean-asm-shaded - ${xbeansVersion} - bundle - test - - - org.apache.xbean - xbean-finder-shaded - ${xbeansVersion} - bundle - test - - - org.apache.xbean - xbean-naming - ${xbeansVersion} - bundle - test - - - org.apache.xbean - xbean-reflect - ${xbeansVersion} - bundle - test - - - commons-beanutils - commons-beanutils - 1.8.3 - jar - test - - - commons-collections - commons-collections - 3.2.2 - jar - test - - - org.hsqldb - hsqldb - 2.2.4 - - + ${commons-lang.version} + + + org.apache.geronimo.components + geronimo-connector + ${geronimo-connector.version} + bundle + compile + + + org.apache.geronimo.components + geronimo-transaction + ${geronimo-transaction.version} + bundle + compile + + + + org.apache.openwebbeans + openwebbeans-spi + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-impl + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-ee + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-ejb + ${openWebBeansVersion} + jar + test + + + org.apache.openwebbeans + openwebbeans-web + ${openWebBeansVersion} + jar + test + + + org.apache.geronimo.bundles + scannotation + ${scannotation.version} + + + + org.apache.xbean + xbean-asm-shaded + ${xbeansVersion} + bundle + test + + + org.apache.xbean + xbean-finder-shaded + ${xbeansVersion} + bundle + test + + + org.apache.xbean + xbean-naming + ${xbeansVersion} + bundle + test + + + org.apache.xbean + xbean-reflect + ${xbeansVersion} + bundle + test + + + commons-beanutils + commons-beanutils + ${commons-beanutils.version} + jar + test + + + commons-collections + commons-collections + ${commons-collections.version} + jar + test + + + org.hsqldb + hsqldb + ${hsqldb.version} + + org.apache.openjpa openjpa - 2.2.2 + ${openjpa.version} test org.apache.servicemix.bundles org.apache.servicemix.bundles.serp - 1.13.1_2 + ${org.apache.servicemix.bundles.serp.version} commons-pool commons-pool - 1.5.3 + ${commons-pool.version} test org.apache.derby derby - 10.10.2.0 + ${derby.version} test @@ -487,7 +544,7 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file diff --git a/ejb/openejb-extender/pom.xml b/ejb/openejb-extender/pom.xml index 6aed440ee4..b8abece699 100644 --- a/ejb/openejb-extender/pom.xml +++ b/ejb/openejb-extender/pom.xml @@ -41,34 +41,43 @@ - - - org.apache.aries.jpa.container.context;resolution:=optional, + + + org.apache.aries.jpa.container.context;resolution:=optional, org.apache.aries.proxy;provide:=true, org.apache.openejb.config;provide:=true, org.apache.openejb.persistence;provide:=true, org.apache.openejb.util.proxy;provide:=true, - * - + * + org.apache.aries.ejb.* - + org.apache.aries.ejb.openejb.extender.EJBExtender 1.0.0 + + 1.0.2 + 1.1 + 1.1.1 + 4.0.0-beta-1 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 - - org.apache.aries - org.apache.aries.util - 1.0.0 - - - org.apache.openejb - openejb-core - 4.0.0-beta-1 + + org.apache.aries + org.apache.aries.util + ${org.apache.aries.util.version} + + + org.apache.openejb + openejb-core + ${openejb-core.version} org.apache.openejb @@ -79,16 +88,16 @@ slf4j-log4j12 - - - org.osgi - org.osgi.core - provided - + + + org.osgi + org.osgi.core + provided + - org.osgi - org.osgi.compendium - provided + org.osgi + org.osgi.compendium + provided org.slf4j @@ -101,53 +110,53 @@ test - org.apache.aries.testsupport - org.apache.aries.testsupport.unit - 1.0.0 - test + org.apache.aries.testsupport + org.apache.aries.testsupport.unit + ${org.apache.aries.testsupport.unit.version} + test - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 - provided + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + ${geronimo-jpa_2.0_spec.version} + provided - - - - + + + + - - - - + + + + - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 - provided + org.apache.geronimo.specs + geronimo-jta_1.1_spec + ${geronimo-jta_1.1_spec.version} + provided - org.apache.geronimo.specs - geronimo-ejb_3.1_spec - 1.0.2 - provided + org.apache.geronimo.specs + geronimo-ejb_3.1_spec + ${geronimo-ejb_3.1_spec.version} + provided - org.apache.aries.proxy - org.apache.aries.proxy.api - 1.0.0 + org.apache.aries.proxy + org.apache.aries.proxy.api + ${org.apache.aries.proxy.api.version} - org.apache.aries.jpa - org.apache.aries.jpa.api - 1.0.0 + org.apache.aries.jpa + org.apache.aries.jpa.api + ${org.apache.aries.jpa.api.version} - + diff --git a/esa-ant-task/pom.xml b/esa-ant-task/pom.xml index dc77ba2402..533426e6f0 100755 --- a/esa-ant-task/pom.xml +++ b/esa-ant-task/pom.xml @@ -1,33 +1,33 @@ - 4.0.0 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.apache.aries parent 2.0.0 ../parent/pom.xml - - esa-ant-task - 1.0.0-SNAPSHOT - Aries ESA Ant Task - Builds an esa (Enterprise Subsystem Archive) from the project for deployment to an aries server. - - 1.8.0 - 2.4.0 - - - - org.apache.ant - ant - ${ant.version} - - - - junit - junit - test - - + + esa-ant-task + 1.0.0-SNAPSHOT + Aries ESA Ant Task + Builds an esa (Enterprise Subsystem Archive) from the project for deployment to an aries server. + + 1.8.0 + 2.4.0 + + + + org.apache.ant + ant + ${ant.version} + + + + junit + junit + test + + diff --git a/esa-maven-plugin/pom.xml b/esa-maven-plugin/pom.xml index df86de4b43..565d1babd0 100644 --- a/esa-maven-plugin/pom.xml +++ b/esa-maven-plugin/pom.xml @@ -27,7 +27,7 @@ 2.0.0 ../parent/pom.xml - + esa-maven-plugin 1.0.3-SNAPSHOT maven-plugin @@ -40,67 +40,82 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + + 0.0.357 + 2.3 + 2.0.4 + 2.0.0 + 2.0.7 + 2.0 + 1.1 + 2.0 + 1.1.3 + 1.0-alpha-7 + 1.0-alpha-9-stable-1 + 1.4.7 + + org.apache.aries org.apache.aries.util - 1.1.3 + ${org.apache.aries.util.version} biz.aQute bndlib - 0.0.357 + ${bndlib.version} org.apache.felix maven-bundle-plugin - 2.0.0 + ${maven-bundle-plugin.version} org.apache.maven maven-plugin-api - 2.0 + ${maven-plugin-api.version} org.apache.maven maven-project - 2.0 + ${maven-project.version} org.apache.maven maven-artifact - 2.0.4 + ${maven-artifact.version} org.apache.maven maven-archiver - 2.3 + ${maven-archiver.version} org.apache.maven maven-model - 2.0.7 + ${maven-model.version} org.codehaus.plexus plexus-archiver - 1.0-alpha-7 + ${plexus-archiver.version} org.codehaus.plexus plexus-utils - 1.4.7 + ${plexus-utils.version} org.codehaus.plexus plexus-container-default - 1.0-alpha-9-stable-1 + ${plexus-container-default.version} org.apache.maven.shared maven-plugin-testing-harness - 1.1 + ${maven-plugin-testing-harness.version} test diff --git a/jmx/jmx-api/pom.xml b/jmx/jmx-api/pom.xml index a80b4705b9..38491c4078 100644 --- a/jmx/jmx-api/pom.xml +++ b/jmx/jmx-api/pom.xml @@ -26,7 +26,7 @@ org.apache.aries.jmx.parent 1.1.6-SNAPSHOT ../jmx-parent - + org.apache.aries.jmx org.apache.aries.jmx.api @@ -50,7 +50,7 @@ * - + 1.1.1 diff --git a/jmx/jmx-blueprint-api/pom.xml b/jmx/jmx-blueprint-api/pom.xml index 92b9c4c5fc..701f3ea5dc 100644 --- a/jmx/jmx-blueprint-api/pom.xml +++ b/jmx/jmx-blueprint-api/pom.xml @@ -26,7 +26,7 @@ parent 2.0.1 ../../parent/pom.xml - + org.apache.aries.jmx org.apache.aries.jmx.blueprint.api @@ -42,7 +42,7 @@ org.apache.aries.jmx.blueprint - + 1.1.0 diff --git a/jmx/jmx-blueprint-bundle/pom.xml b/jmx/jmx-blueprint-bundle/pom.xml index 45956f488c..a316322e46 100644 --- a/jmx/jmx-blueprint-bundle/pom.xml +++ b/jmx/jmx-blueprint-bundle/pom.xml @@ -26,14 +26,14 @@ org.apache.aries.jmx.parent 1.1.6-SNAPSHOT ../jmx-parent - + org.apache.aries.jmx org.apache.aries.jmx.blueprint bundle Apache Aries JMX Blueprint Bundle - This bundle contains the standalone implementation of the along with the API. + This bundle contains the standalone implementation of the along with the API. diff --git a/jmx/jmx-blueprint-core/pom.xml b/jmx/jmx-blueprint-core/pom.xml index 2025445103..ed8f7060f8 100644 --- a/jmx/jmx-blueprint-core/pom.xml +++ b/jmx/jmx-blueprint-core/pom.xml @@ -26,7 +26,7 @@ parent 2.0.1 ../../parent/pom.xml - + org.apache.aries.jmx org.apache.aries.jmx.blueprint.core @@ -52,18 +52,22 @@ javax.management.MBeanServer 1.1.0 + + 2.5.1 + 1.2.0 + 1.1.1 org.apache.aries.jmx org.apache.aries.jmx.blueprint.api - 1.2.0 + ${org.apache.aries.jmx.blueprint.api.version} org.apache.aries org.apache.aries.util - 1.1.1 + ${org.apache.aries.util.version} org.osgi @@ -93,13 +97,13 @@ org.jmock jmock-junit4 - 2.5.1 + ${jmock.version} test org.jmock jmock-legacy - 2.5.1 + ${jmock.version} test diff --git a/jmx/jmx-bundle/pom.xml b/jmx/jmx-bundle/pom.xml index 1acb2c9eff..5be7f07195 100644 --- a/jmx/jmx-bundle/pom.xml +++ b/jmx/jmx-bundle/pom.xml @@ -26,14 +26,14 @@ org.apache.aries.jmx.parent 1.1.5 ../jmx-parent - + org.apache.aries.jmx org.apache.aries.jmx bundle Apache Aries JMX Bundle - This bundle contains the standalone implementation of the along with the API. + This bundle contains the standalone implementation of the along with the API. @@ -79,6 +79,8 @@ true 1.1.1 + + 1.1.9-SNAPSHOT @@ -90,7 +92,7 @@ org.apache.aries.jmx org.apache.aries.jmx.core - 1.1.9-SNAPSHOT + ${org.apache.aries.jmx.core.version} org.osgi @@ -219,7 +221,7 @@ - + diff --git a/jmx/jmx-core-whiteboard/pom.xml b/jmx/jmx-core-whiteboard/pom.xml index a415530238..d12bacc425 100644 --- a/jmx/jmx-core-whiteboard/pom.xml +++ b/jmx/jmx-core-whiteboard/pom.xml @@ -26,7 +26,7 @@ parent 2.0.1 ../../parent/pom.xml - + org.apache.aries.jmx org.apache.aries.jmx.core.whiteboard @@ -51,10 +51,10 @@ - org.apache.aries.jmx.codec + org.apache.aries.jmx.codec - org.apache.aries.jmx* + org.apache.aries.jmx* org.osgi.jmx.service.cm;version="[1.3,2)", @@ -67,18 +67,23 @@ org.osgi.service.useradmin;version="[1.1,2)" 1.1.1 + + 1.8.2 + 1.1.5 + 1.1.8 + 1.1.1 org.apache.aries.jmx org.apache.aries.jmx.api - 1.1.5 + ${org.apache.aries.jmx.api.version} org.apache.aries.jmx org.apache.aries.jmx.core - 1.1.8 + ${org.apache.aries.jmx.core.version} org.osgi @@ -93,21 +98,21 @@ org.apache.aries org.apache.aries.util - 1.1.1 + ${org.apache.aries.util.version} org.mockito mockito-all test - 1.8.2 + ${mockito-all.version} - junit - junit - test + junit + junit + test - + @@ -126,4 +131,4 @@ - + diff --git a/jmx/jmx-core/pom.xml b/jmx/jmx-core/pom.xml index 57488c7f06..6265597b56 100644 --- a/jmx/jmx-core/pom.xml +++ b/jmx/jmx-core/pom.xml @@ -26,16 +26,16 @@ parent 2.0.1 ../../parent/pom.xml - + org.apache.aries.jmx org.apache.aries.jmx.core - 1.1.9-SNAPSHOT + 1.1.9-SNAPSHOT bundle Apache Aries JMX Core - This bundle contains the core implementation - of the JMX Control specification + This bundle contains the core implementation + of the JMX Control specification @@ -76,13 +76,18 @@ javax.management.MBeanServer 1.1.1 + + 3.1 + 1.8.2 + 1.1.5 + 1.1.1 org.apache.aries.jmx org.apache.aries.jmx.api - 1.1.5 + ${org.apache.aries.jmx.api.version} org.osgi @@ -97,18 +102,18 @@ org.apache.aries org.apache.aries.util - 1.1.1 + ${org.apache.aries.util.version} org.mockito mockito-all test - 1.8.2 + ${mockito-all.version} - junit - junit - test + junit + junit + test @@ -117,7 +122,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} org.apache.aries.versioning @@ -134,12 +139,12 @@ org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - + maven-javadoc-plugin + + -Xdoclint:none + - + diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml index 36422c0e7b..203275d174 100644 --- a/jmx/jmx-itests/pom.xml +++ b/jmx/jmx-itests/pom.xml @@ -26,20 +26,36 @@ org.apache.aries.jmx.parent 1.1.6-SNAPSHOT ../jmx-parent - + org.apache.aries.jmx org.apache.aries.jmx.itests jar Apache Aries JMX integration tests - Integration tests for the JMX component (using the standalone composite jmx-bundle) + Integration tests for the JMX component (using the standalone composite jmx-bundle) - + + 5.0.3 + 2.0 + 1.2 + 1.0.0 + 1.0.0 + 1.0.0 + 1.1.9-SNAPSHOT + 1.1.7-SNAPSHOT + 0.0.2-SNAPSHOT + 1.0.2-SNAPSHOT + 2.0.0-SNAPSHOT + 1.0.0 + 1.8.0 + 3.8.0.v20120529-1548 + 1.7.7 + 2.0.0 3.4.0 - 2.5.3 1.2.13 + 2.5.3 @@ -58,7 +74,7 @@ org.apache.aries.jmx org.apache.aries.jmx.core - 1.1.9-SNAPSHOT + ${org.apache.aries.jmx.core.version} provided @@ -75,12 +91,12 @@ org.apache.aries.jmx org.apache.aries.jmx.core.whiteboard - 1.1.7-SNAPSHOT + ${org.apache.aries.jmx.core.whiteboard.version} org.apache.aries.jmx org.apache.aries.jmx.mbeanserver-platform - 0.0.2-SNAPSHOT + ${org.apache.aries.jmx.mbeanserver-platform.version} org.osgi @@ -88,74 +104,74 @@ provided - org.apache.aries.testsupport - org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT - test - + org.apache.aries.testsupport + org.apache.aries.testsupport.unit + ${org.apache.aries.testsupport.unit.version} + test + org.apache.aries.blueprint org.apache.aries.blueprint.sample - 1.0.0 + ${org.apache.aries.blueprint.sample.version} test org.apache.aries.blueprint org.apache.aries.blueprint.jexl.evaluator test - 1.0.0 + ${org.apache.aries.blueprint.jexl.evaluator.version} org.apache.commons commons-jexl - 2.0 + ${commons-jexl.version} test org.apache.aries.proxy org.apache.aries.proxy - 1.0.2-SNAPSHOT + ${org.apache.aries.proxy.version} test org.ow2.asm asm-debug-all - 5.0.3 + ${asm-debug-all.version} test - org.apache.felix - org.apache.felix.configadmin - 1.8.0 - - - org.apache.felix - org.osgi.compendium - - - org.apache.felix - org.osgi.core - - + org.apache.felix + org.apache.felix.configadmin + ${org.apache.felix.configadmin.version} + + + org.apache.felix + org.osgi.compendium + + + org.apache.felix + org.osgi.core + + org.apache.aries org.apache.aries.util - 1.0.0 + ${org.apache.aries.util.version} test org.apache.aries.blueprint org.apache.aries.blueprint - 1.0.0 + ${org.apache.aries.blueprint.version} test - - + + org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -202,12 +218,12 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} - - org.osgi.core - org.osgi - + + org.osgi.core + org.osgi + @@ -218,16 +234,16 @@ org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} - + org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file diff --git a/jmx/jmx-mbeanserver-platform/pom.xml b/jmx/jmx-mbeanserver-platform/pom.xml index 421ac19657..116ece68c1 100644 --- a/jmx/jmx-mbeanserver-platform/pom.xml +++ b/jmx/jmx-mbeanserver-platform/pom.xml @@ -26,7 +26,7 @@ org.apache.aries.jmx.parent 1.1.5 ../jmx-parent - + org.apache.aries.jmx.mbeanserver-platform 0.0.2-SNAPSHOT @@ -43,11 +43,11 @@ - + org.apache.aries.jmx.mbean_server.platform.impl.Activator - + org.apache.aries.jmx.mbean_server.platform.impl diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml index 8a49859662..4fab9100eb 100644 --- a/jmx/jmx-whiteboard/pom.xml +++ b/jmx/jmx-whiteboard/pom.xml @@ -82,7 +82,11 @@ 3.4.0 1 + 1.3 + 1.10.19 + 1.1.8 3.11.3 + 2.0.0 2.5.3 @@ -135,7 +139,7 @@ org.apache.aries.jmx org.apache.aries.jmx.core - 1.1.8 + ${org.apache.aries.jmx.core.version} provided @@ -155,7 +159,7 @@ org.mockito mockito-all test - 1.10.19 + ${mockito-all.version} junit @@ -197,7 +201,7 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} test @@ -222,7 +226,7 @@ maven-antrun-plugin - 1.3 + ${maven-antrun-plugin.version} cm-file-create @@ -232,7 +236,7 @@ - + diff --git a/jmx/pom.xml b/jmx/pom.xml index 609fc8bb6b..2a3def46a1 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -26,7 +26,7 @@ org.apache.aries.jmx.parent 1.1.6-SNAPSHOT jmx-parent - + org.apache.aries.jmx jmx diff --git a/jndi/jndi-api/pom.xml b/jndi/jndi-api/pom.xml index 8bdc0a8470..67c3c389b2 100644 --- a/jndi/jndi-api/pom.xml +++ b/jndi/jndi-api/pom.xml @@ -52,7 +52,7 @@ org.apache.aries.jndi.api, org.apache.aries.jndi.spi - + 1.0.0 diff --git a/jndi/jndi-bundle/pom.xml b/jndi/jndi-bundle/pom.xml index 80e2163761..6c53f60bc9 100644 --- a/jndi/jndi-bundle/pom.xml +++ b/jndi/jndi-bundle/pom.xml @@ -257,19 +257,19 @@ -Xdoclint:none - - org.apache.aries.versioning - org.apache.aries.versioning.plugin - - - default-verify - verify - - version-check - - - - + + org.apache.aries.versioning + org.apache.aries.versioning.plugin + + + default-verify + verify + + version-check + + + + diff --git a/jndi/jndi-core/pom.xml b/jndi/jndi-core/pom.xml index 697fb1e835..f3d76956f9 100644 --- a/jndi/jndi-core/pom.xml +++ b/jndi/jndi-core/pom.xml @@ -34,7 +34,7 @@ Apache Aries JNDI Core 1.1.0-SNAPSHOT - This bundle contains the core of JNDI support for OSGi. + This bundle contains the core of JNDI support for OSGi. @@ -52,7 +52,7 @@ org.apache.aries.jndi.startup.Activator - + 1.0.0 1.1.0 diff --git a/jndi/jndi-legacy-support/pom.xml b/jndi/jndi-legacy-support/pom.xml index dd42032c85..dece5f1bf8 100644 --- a/jndi/jndi-legacy-support/pom.xml +++ b/jndi/jndi-legacy-support/pom.xml @@ -34,7 +34,7 @@ 1.0.1-SNAPSHOT Apache Aries JNDI Support for Legacy Runtimes - This bundle contains support for legacy runtimes which rely on the thread context classloader to load JNDI implementations. It is intended for use with OSGi Web Container implementations which do not correctly work with the OSGi JNDI Service specification. + This bundle contains support for legacy runtimes which rely on the thread context classloader to load JNDI implementations. It is intended for use with OSGi Web Container implementations which do not correctly work with the OSGi JNDI Service specification. @@ -44,7 +44,7 @@ - + org.apache.aries.jndi.legacy.support @@ -61,7 +61,7 @@ provided - + org.apache.aries.versioning diff --git a/jndi/jndi-rmi/pom.xml b/jndi/jndi-rmi/pom.xml index 67f06fe173..240892732f 100644 --- a/jndi/jndi-rmi/pom.xml +++ b/jndi/jndi-rmi/pom.xml @@ -34,7 +34,7 @@ Apache Aries JNDI RMI Handler 1.0.1-SNAPSHOT - This bundle contains the JNDI RMI handler + This bundle contains the JNDI RMI handler @@ -50,7 +50,7 @@ ${project.artifactId}* - + 1.0.0 1.0.0 @@ -84,7 +84,7 @@ - + org.apache.aries.versioning diff --git a/jndi/jndi-url-itest-biz/pom.xml b/jndi/jndi-url-itest-biz/pom.xml index 9da3800023..db6818caac 100644 --- a/jndi/jndi-url-itest-biz/pom.xml +++ b/jndi/jndi-url-itest-biz/pom.xml @@ -20,14 +20,14 @@ 4.0.0 - + org.apache.aries.jndi jndi-parent 1.0.0-SNAPSHOT ../parent/pom.xml - + org.apache.aries.jndi org.apache.aries.jndi.url.itest.biz Apache Aries JNDI "business logic" test bundle for Aries jndi-url iTests @@ -43,7 +43,7 @@ * * - + - + diff --git a/jndi/jndi-url-itest-web/pom.xml b/jndi/jndi-url-itest-web/pom.xml index 29edbce9f1..31b36821f5 100644 --- a/jndi/jndi-url-itest-web/pom.xml +++ b/jndi/jndi-url-itest-web/pom.xml @@ -20,14 +20,14 @@ 4.0.0 - + org.apache.aries.jndi jndi-parent 1.0.0-SNAPSHOT ../parent/pom.xml - + org.apache.aries.jndi org.apache.aries.jndi.url.itest.web Apache Aries JNDI Test Bundle for Aries jndi-url iTests @@ -49,27 +49,29 @@ javax.servlet*;version=2.5, * - + + + 1.2 org.apache.geronimo.specs geronimo-servlet_2.5_spec - 1.2 + ${geronimo-servlet_2.5_spec.version} - org.apache.felix - maven-bundle-plugin - - - /jndiUrlItest - - + org.apache.felix + maven-bundle-plugin + + + /jndiUrlItest + + diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml index b60548a4b4..71e660cb8d 100644 --- a/jndi/jndi-url-itest/pom.xml +++ b/jndi/jndi-url-itest/pom.xml @@ -41,17 +41,28 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - - + + + 5.0.3 + 3.2.0-v20070116 + 1.2 + ${jndi-api.dev-version} + ${jndi-bundle.dev-version} + ${jndi-url-itest-biz.dev-version} + ${jndi-url-itest-web.dev-version} + ${jndi-url.dev-version} + 1.5.16 + 2.0.0-SNAPSHOT + 3.4.0 + 2.1_3_4 + 3.11.3 4.11.0 2.6.0 - - ${jndi-api.dev-version} - ${jndi-bundle.dev-version} - ${jndi-url.dev-version} - ${jndi-url-itest-web.dev-version} - ${jndi-url-itest-biz.dev-version} - 1.5.16 + 1.1.18 + 1.1.18 + 3.1.200-v20070605 + 1.7.7 + 2.0.0 @@ -94,10 +105,10 @@ provided - org.apache.aries.testsupport - org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT - test + org.apache.aries.testsupport + org.apache.aries.testsupport.unit + ${org.apache.aries.testsupport.unit.version} + test @@ -105,7 +116,7 @@ org.apache.aries.blueprint.api test - + org.apache.aries.blueprint org.apache.aries.blueprint.core @@ -127,11 +138,11 @@ org.apache.aries.proxy.impl - + org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -178,12 +189,12 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} - + org.osgi - org.osgi.core - + org.osgi.core + @@ -194,64 +205,64 @@ org.eclipse.platform org.eclipse.osgi - 3.11.3 + ${org.eclipse.osgi.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.cglib test - 2.1_3_4 + ${org.apache.servicemix.bundles.cglib.version} org.ow2.asm asm-debug-all test - 5.0.3 + ${asm-debug-all.version} - - org.eclipse.equinox - cm - 3.2.0-v20070116 + + org.eclipse.equinox + cm + ${cm.version} test - + - - org.eclipse.osgi - services - 3.1.200-v20070605 + + org.eclipse.osgi + services + ${services.version} test - + org.apache.geronimo.specs geronimo-servlet_2.5_spec test - 1.2 + ${geronimo-servlet_2.5_spec.version} - - - org.ops4j.pax.web - pax-web-extender-war + + + org.ops4j.pax.web + pax-web-extender-war test - 1.1.18 - - - org.ops4j.pax.web - pax-web-jetty-bundle + ${pax-web-extender-war.version} + + + org.ops4j.pax.web + pax-web-jetty-bundle test - 1.1.18 - + ${pax-web-jetty-bundle.version} + - - org.apache.felix - org.apache.felix.fileinstall + + org.apache.felix + org.apache.felix.fileinstall test - 3.4.0 - - + ${org.apache.felix.fileinstall.version} + + org.ops4j.pax.logging pax-logging-api @@ -264,7 +275,7 @@ - + org.apache.maven.plugins @@ -279,7 +290,7 @@ 1.2 - generate-resources + generate-resources generate-depends-file generate-depends-file diff --git a/jndi/jndi-url/pom.xml b/jndi/jndi-url/pom.xml index 7a316bdf52..abb2346325 100644 --- a/jndi/jndi-url/pom.xml +++ b/jndi/jndi-url/pom.xml @@ -34,7 +34,7 @@ Apache Aries JNDI URL Handler 1.1.1-SNAPSHOT - This bundle contains the JNDI URL handler for OSGi + This bundle contains the JNDI URL handler for OSGi @@ -55,11 +55,11 @@ org.apache.aries.jndi.url.Activator - org.osgi.service.blueprint.container;resolution:=optional, - * + org.osgi.service.blueprint.container;resolution:=optional, + * - org.apache.aries.proxy.ProxyManager + org.apache.aries.proxy.ProxyManager 1.0.0 diff --git a/jndi/parent/pom.xml b/jndi/parent/pom.xml index 2634b60fed..5cc4e70b8b 100644 --- a/jndi/parent/pom.xml +++ b/jndi/parent/pom.xml @@ -52,6 +52,19 @@ 1.0.1-SNAPSHOT 1.0.1-SNAPSHOT 1.0.1-SNAPSHOT + 1.1.3 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 6.0.0 + 6.0.0 + 6.0.0 + 0.12 + 1.8 + 1.8 + 2.0.0-SNAPSHOT + 1.7.25 @@ -59,56 +72,56 @@ org.apache.aries org.apache.aries.util - 1.1.3 + ${org.apache.aries.util.version} org.apache.aries.proxy org.apache.aries.proxy.api - 1.0.0 + ${org.apache.aries.proxy.api.version} org.apache.aries.proxy org.apache.aries.proxy.impl - 1.0.0 + ${org.apache.aries.proxy.impl.version} org.apache.aries.blueprint org.apache.aries.blueprint.api - 1.0.0 + ${org.apache.aries.blueprint.api.version} org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.0.0 + ${org.apache.aries.blueprint.core.version} org.osgi osgi.core - 6.0.0 + ${osgi.core.version} provided org.osgi osgi.cmpn - 6.0.0 + ${osgi.cmpn.version} provided org.osgi osgi.enterprise - 6.0.0 + ${osgi.enterprise.version} provided org.slf4j slf4j-api - 1.7.25 + ${slf4j-api.version} provided org.apache.aries.testsupport org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} test @@ -139,14 +152,14 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + ${java.source.version} + ${java.target.version} org.apache.rat apache-rat-plugin - 0.12 + ${apache-rat-plugin.version} verify diff --git a/jndi/pom.xml b/jndi/pom.xml index 570bd07e8c..9fed27dd40 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -26,7 +26,7 @@ parent 2.0.1 ../parent/pom.xml - + org.apache.aries.jndi jndi diff --git a/parent/pom.xml b/parent/pom.xml index 2fc3b40267..c1e45e9be7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -26,7 +26,7 @@ org.apache apache 30 - + org.apache.aries @@ -52,8 +52,8 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - HEAD - + HEAD + jira @@ -183,9 +183,9 @@ - - - + + + org.apache.aries.*, ${aries.osgi.import.before.defaults}, @@ -193,7 +193,7 @@ ${aries.osgi.import.additional}, * - + false [$(version;==;$(@)),$(version;+;$(@))) @@ -205,7 +205,7 @@ -split-package:=first ${aries.osgi.import.pkg} - + ${project.artifactId} false Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL @@ -319,7 +319,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -359,7 +359,7 @@ - + @@ -380,7 +380,7 @@ - + diff --git a/proxy/pom.xml b/proxy/pom.xml index 9323129ec4..3ab9238011 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -26,7 +26,7 @@ parent 2.0.0 ../parent/pom.xml - + org.apache.aries.proxy proxy @@ -34,7 +34,7 @@ pom 1.0.1-SNAPSHOT - A common proxy class generation service that can be used by blueprint and jndi and others. + A common proxy class generation service that can be used by blueprint and jndi and others. diff --git a/proxy/proxy-api/pom.xml b/proxy/proxy-api/pom.xml index 6171cabdd1..12aa404ea4 100644 --- a/proxy/proxy-api/pom.xml +++ b/proxy/proxy-api/pom.xml @@ -41,17 +41,17 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - HEAD - + HEAD + org.apache.aries.proxy* - + 1.1.1 - + true @@ -64,7 +64,7 @@ provided - + diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml index 9ed4c08779..35d809eaef 100644 --- a/proxy/proxy-impl/pom.xml +++ b/proxy/proxy-impl/pom.xml @@ -41,8 +41,8 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - HEAD - + HEAD + @@ -64,26 +64,33 @@ org.apache.aries.proxy.impl* 1.1.14 + + 9.6 + 2.15.0 + 1.0 + 1.3 + 3.7.7 + 1.1.1 org.apache.aries.proxy org.apache.aries.proxy.api - 1.1.1 + ${org.apache.aries.proxy.api.version} provided org.ow2.asm asm true - 9.6 + ${asm.version} org.ow2.asm asm-commons true - 9.6 + ${asm.version} org.slf4j @@ -104,7 +111,7 @@ commons-io commons-io - 2.15.0 + ${commons-io.version} test @@ -120,19 +127,19 @@ org.mockito mockito-core - 3.7.7 + ${mockito-core.version} test javax.transaction javax.transaction-api - 1.3 + ${javax.transaction-api.version} test org.apache.geronimo.specs geronimo-j2ee-connector_1.6_spec - 1.0 + ${geronimo-j2ee-connector_1.6_spec.version} test @@ -153,10 +160,10 @@ - + - + @@ -195,10 +202,10 @@ org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - + maven-javadoc-plugin + + -Xdoclint:none + diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml index 579eb73364..72a3cf6c44 100644 --- a/proxy/proxy-itests/pom.xml +++ b/proxy/proxy-itests/pom.xml @@ -43,17 +43,25 @@ + 9.6 + 1.2 4.13.3 - 2.5.3 + 1 1.5.16 - 9.6 + 3.1 + 1.1.2-SNAPSHOT + 1.1.15-SNAPSHOT + 3.11.3 + 1.7.7 + 2.0.0 + 2.5.3 org.eclipse.platform org.eclipse.osgi - 3.11.3 + ${org.eclipse.osgi.version} provided @@ -65,20 +73,20 @@ org.apache.aries.proxy org.apache.aries.proxy.api test - 1.1.2-SNAPSHOT + ${org.apache.aries.proxy.api.version} org.apache.aries.proxy org.apache.aries.proxy test - 1.1.15-SNAPSHOT + ${org.apache.aries.proxy.version} org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -125,7 +133,7 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} junit @@ -160,7 +168,7 @@ javax.inject javax.inject - 1 + ${javax.inject.version} test @@ -179,7 +187,7 @@ maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} org.apache.maven.plugins @@ -191,7 +199,7 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file diff --git a/pushstream/pom.xml b/pushstream/pom.xml index 2f5f932045..9e1e690842 100644 --- a/pushstream/pom.xml +++ b/pushstream/pom.xml @@ -18,101 +18,113 @@ under the License. --> - 4.0.0 - - org.apache - apache - 17 - - + 4.0.0 + + org.apache + apache + 17 + + - org.apache.aries.pushstream - parent - 0.0.1-SNAPSHOT - pom - Apache Aries Push Stream Parent + org.apache.aries.pushstream + parent + 0.0.1-SNAPSHOT + pom + Apache Aries Push Stream Parent - - scm:git:https://gitbox.apache.org/repos/asf/aries.git - scm:git:https://gitbox.apache.org/repos/asf/aries.git - https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + scm:git:https://gitbox.apache.org/repos/asf/aries.git + scm:git:https://gitbox.apache.org/repos/asf/aries.git + https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + - pushstream + pushstream - - - - org.osgi - osgi.annotation - 6.0.1 - provided - - - org.apache.aries.async - org.apache.aries.async.promise.api - 1.0.1 - - - org.slf4j - slf4j-api - 1.7.0 - - - junit - junit - 4.11 - test - - - org.mockito - mockito-all - 1.9.5 - test - - - + + 1.8 + 1.8 - - - - - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 1.8 - - - - biz.aQute.bnd - bnd-maven-plugin - 3.2.0 - - - default-bnd-process - - bnd-process - - - - - - - + 3.2.0 + 4.11 + 1.9.5 + 1.0.1 + 6.0.1 + 1.7.0 + + + + + + org.osgi + osgi.annotation + ${osgi.annotation.version} + provided + + + org.apache.aries.async + org.apache.aries.async.promise.api + ${org.apache.aries.async.promise.api.version} + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + junit + junit + ${junit.version} + test + + + org.mockito + mockito-all + ${mockito-all.version} + test + + + + + + + + + maven-compiler-plugin + + ${java.source.version} + ${java.target.version} + + + + org.apache.maven.plugins + maven-jar-plugin + + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${java.source.version} + + + + biz.aQute.bnd + bnd-maven-plugin + ${bnd-maven-plugin.version} + + + default-bnd-process + + bnd-process + + + + + + + diff --git a/pushstream/pushstream/pom.xml b/pushstream/pushstream/pom.xml index c630804d8f..3b83366ae5 100644 --- a/pushstream/pushstream/pom.xml +++ b/pushstream/pushstream/pom.xml @@ -18,47 +18,47 @@ under the License. --> - 4.0.0 - - org.apache.aries.pushstream - parent - 0.0.1-SNAPSHOT - ../pom.xml - - org.apache.aries.pushstream - pushstream - Apache Aries Push Streams - 0.0.1-SNAPSHOT + 4.0.0 + + org.apache.aries.pushstream + parent + 0.0.1-SNAPSHOT + ../pom.xml + + org.apache.aries.pushstream + pushstream + Apache Aries Push Streams + 0.0.1-SNAPSHOT - + This bundle contains the Apache Aries OSGi Push Stream implementation. - - scm:git:https://gitbox.apache.org/repos/asf/aries.git - scm:git:https://gitbox.apache.org/repos/asf/aries.git - https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + scm:git:https://gitbox.apache.org/repos/asf/aries.git + scm:git:https://gitbox.apache.org/repos/asf/aries.git + https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + - - - org.osgi - osgi.annotation - - - org.apache.aries.async - org.apache.aries.async.promise.api - - + + + org.osgi + osgi.annotation + + + org.apache.aries.async + org.apache.aries.async.promise.api + + - - - - biz.aQute.bnd - bnd-maven-plugin - - - + + + + biz.aQute.bnd + bnd-maven-plugin + + + diff --git a/quiesce/quiesce-manager-itest/pom.xml b/quiesce/quiesce-manager-itest/pom.xml index 81e6b43133..091ccf12f0 100644 --- a/quiesce/quiesce-manager-itest/pom.xml +++ b/quiesce/quiesce-manager-itest/pom.xml @@ -39,28 +39,44 @@ https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + + 3.2.2 + 2.4 + 1.5.3 + 1.2 + 1.0.0 + 1.0.0 + 2.0.0-SNAPSHOT + 1.0.0 + 1.2.4 + 1.13.1_2 + 3.8.0.v20120529-1548 + 3.4.0 + 2.5.3 + + org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} org.apache.aries.quiesce org.apache.aries.quiesce.api - 1.0.0 + ${org.apache.aries.quiesce.api.version} provided org.apache.aries.quiesce org.apache.aries.quiesce.manager - 1.0.0 + ${org.apache.aries.quiesce.manager.version} provided org.apache.aries.testsupport org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} test @@ -204,9 +209,9 @@ org.apache.aries.application.deployment.management - - org.apache.aries.application - org.apache.aries.application.default.local.platform + + org.apache.aries.application + org.apache.aries.application.default.local.platform diff --git a/samples/ariestrader/modules/ariestrader-api/pom.xml b/samples/ariestrader/modules/ariestrader-api/pom.xml index 73393deb44..85eaca8c4c 100644 --- a/samples/ariestrader/modules/ariestrader-api/pom.xml +++ b/samples/ariestrader/modules/ariestrader-api/pom.xml @@ -24,14 +24,13 @@ 1.0.1-SNAPSHOT - - - + + org.apache.aries.samples.ariestrader.api, org.apache.aries.samples.ariestrader.api.persistence - - + + org.apache.aries.samples.ariestrader diff --git a/samples/ariestrader/modules/ariestrader-beans/pom.xml b/samples/ariestrader/modules/ariestrader-beans/pom.xml index b986510687..2d0936f656 100644 --- a/samples/ariestrader/modules/ariestrader-beans/pom.xml +++ b/samples/ariestrader/modules/ariestrader-beans/pom.xml @@ -32,15 +32,15 @@ - - - org.apache.aries.samples.ariestrader.beans - - - org.apache.aries.samples.ariestrader.api.persistence;provide:=true, - * - - + + + org.apache.aries.samples.ariestrader.beans + + + org.apache.aries.samples.ariestrader.api.persistence;provide:=true, + * + + diff --git a/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml b/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml index e1cf88dc6a..2a95b57015 100644 --- a/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml +++ b/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml @@ -23,7 +23,7 @@ modules 1.0.1-SNAPSHOT - + org.apache.aries.samples.ariestrader org.apache.aries.samples.ariestrader.derby.ds bundle @@ -31,8 +31,8 @@ AriesTrader Derby DataSource - - + + diff --git a/samples/ariestrader/modules/ariestrader-entities/pom.xml b/samples/ariestrader/modules/ariestrader-entities/pom.xml index 27367773f6..2bee09b352 100644 --- a/samples/ariestrader/modules/ariestrader-entities/pom.xml +++ b/samples/ariestrader/modules/ariestrader-entities/pom.xml @@ -30,11 +30,9 @@ AriesTrader :: Modules - Entities AriesTrader JPA Enhanced Entities Module - - - - + + @@ -52,7 +50,7 @@ org.apache.geronimo.specs geronimo-jta_1.1_spec provided - + org.apache.geronimo.specs geronimo-jpa_2.0_spec @@ -68,7 +66,7 @@ net.sourceforge.serp serp provided - + commons-lang commons-lang @@ -93,16 +91,16 @@ - + - + - - + + - - + + diff --git a/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml b/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml index 653036253a..80e1ae0941 100644 --- a/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml +++ b/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml @@ -58,8 +58,8 @@ org.apache.aries.samples.ariestrader.persist.jdbc.* !org.apache.aries.samples.ariestrader.persist.jdbc.* - org.apache.aries.samples.ariestrader.api;provide:=true, - * + org.apache.aries.samples.ariestrader.api;provide:=true, + * diff --git a/samples/ariestrader/modules/ariestrader-util/pom.xml b/samples/ariestrader/modules/ariestrader-util/pom.xml index b4947b5fec..829a9a8b2f 100644 --- a/samples/ariestrader/modules/ariestrader-util/pom.xml +++ b/samples/ariestrader/modules/ariestrader-util/pom.xml @@ -32,11 +32,11 @@ - - - org.apache.aries.samples.ariestrader.util - - + + + org.apache.aries.samples.ariestrader.util + + diff --git a/samples/ariestrader/modules/ariestrader-web/pom.xml b/samples/ariestrader/modules/ariestrader-web/pom.xml index 67720ae71d..2450e9b8f1 100644 --- a/samples/ariestrader/modules/ariestrader-web/pom.xml +++ b/samples/ariestrader/modules/ariestrader-web/pom.xml @@ -18,19 +18,19 @@ 4.0.0 - + org.apache.aries.samples.ariestrader modules 1.0.1-SNAPSHOT - + org.apache.aries.samples.ariestrader - org.apache.aries.samples.ariestrader.web + org.apache.aries.samples.ariestrader.web bundle - AriesTrader :: Modules - Web + AriesTrader :: Modules - Web A version of AriesTrader for basic Web containers - + org.apache.aries.samples.ariestrader @@ -59,21 +59,21 @@ - org.apache.felix - maven-bundle-plugin - - - /ariestrader - / - org.apache.aries.samples.ariestrader.web.* - !org.apache.aries.samples.ariestrader.web.* - - javax.servlet*;version=2.5, - * - - <_wab>src/main/webapp - - + org.apache.felix + maven-bundle-plugin + + + /ariestrader + / + org.apache.aries.samples.ariestrader.web.* + !org.apache.aries.samples.ariestrader.web.* + + javax.servlet*;version=2.5, + * + + <_wab>src/main/webapp + + diff --git a/samples/ariestrader/modules/pom.xml b/samples/ariestrader/modules/pom.xml index c8b05397d0..88c583074c 100644 --- a/samples/ariestrader/modules/pom.xml +++ b/samples/ariestrader/modules/pom.xml @@ -83,7 +83,7 @@ ${project.version} - + diff --git a/samples/blog/blog-api/pom.xml b/samples/blog/blog-api/pom.xml index a4e93cad23..a746b4b0e2 100644 --- a/samples/blog/blog-api/pom.xml +++ b/samples/blog/blog-api/pom.xml @@ -30,13 +30,13 @@ bundle - - - org.apache.aries.samples.blog.api, - org.apache.aries.samples.blog.api.comment.persistence, - org.apache.aries.samples.blog.api.persistence, - - + + + org.apache.aries.samples.blog.api, + org.apache.aries.samples.blog.api.comment.persistence, + org.apache.aries.samples.blog.api.persistence, + + diff --git a/samples/blog/blog-assembly/pom.xml b/samples/blog/blog-assembly/pom.xml index 3f41077c44..32e657a929 100644 --- a/samples/blog/blog-assembly/pom.xml +++ b/samples/blog/blog-assembly/pom.xml @@ -1,302 +1,306 @@ - + - 4.0.0 + 4.0.0 - - org.apache.aries.samples.blog - blog + + org.apache.aries.samples.blog + blog 1.0.1-SNAPSHOT - - - org.apache.aries.samples.blog.assembly - Apache Aries blog sample assembly - pom - - - - - - - org.eclipse.tycho - org.eclipse.osgi - - - - org.eclipse.equinox - cm - 3.2.0-v20070116 - - - - org.eclipse.osgi - services - 3.1.200-v20070605 - - - - org.ops4j.pax.logging - pax-logging-api - - - - org.ops4j.pax.logging - pax-logging-service - - - - org.ops4j.pax.web - pax-web-extender-war - - - org.ops4j.pax.web - pax-web-jetty-bundle - - - - org.ops4j.pax.web - pax-web-jsp - - - - org.apache.derby - derby - - - - org.apache.felix - org.apache.felix.fileinstall - + + + org.apache.aries.samples.blog.assembly + Apache Aries blog sample assembly + pom + + + 3.2.0-v20070116 + 3.1.200-v20070605 + + + + + + + + org.eclipse.tycho + org.eclipse.osgi + + + + org.eclipse.equinox + cm + ${cm.version} + + + + org.eclipse.osgi + services + ${services.version} + + + + org.ops4j.pax.logging + pax-logging-api + + + + org.ops4j.pax.logging + pax-logging-service + + + + org.ops4j.pax.web + pax-web-extender-war + + + org.ops4j.pax.web + pax-web-jetty-bundle + + + + org.ops4j.pax.web + pax-web-jsp + + + + org.apache.derby + derby + + + + org.apache.felix + org.apache.felix.fileinstall + org.apache.felix org.apache.felix.bundlerepository - + - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec - + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec + org.apache.geronimo.specs geronimo-servlet_2.5_spec - - org.apache.geronimo.components - geronimo-transaction - + + org.apache.geronimo.components + geronimo-transaction + - - org.apache.openjpa - openjpa - - - + + org.apache.openjpa + openjpa + + + commons-lang commons-lang - + commons-collections commons-collections - + commons-pool commons-pool - + org.apache.servicemix.bundles org.apache.servicemix.bundles.serp - - + - - org.apache.aries.blueprint - org.apache.aries.blueprint - + + org.apache.aries.blueprint + org.apache.aries.blueprint + - - org.apache.aries.proxy - org.apache.aries.proxy - + + org.apache.aries.proxy + org.apache.aries.proxy + - - org.apache.aries - org.apache.aries.util - + + org.apache.aries + org.apache.aries.util + - - org.apache.aries.jndi - org.apache.aries.jndi - + + org.apache.aries.jndi + org.apache.aries.jndi + - - org.apache.aries.application - org.apache.aries.application.install - + + org.apache.aries.application + org.apache.aries.application.install + - - org.apache.aries.application - org.apache.aries.application.api - + + org.apache.aries.application + org.apache.aries.application.api + - - org.apache.aries.application - org.apache.aries.application.management - + + org.apache.aries.application + org.apache.aries.application.management + - - org.apache.aries.application - org.apache.aries.application.runtime - + + org.apache.aries.application + org.apache.aries.application.runtime + - - org.apache.aries.application - org.apache.aries.application.utils - + + org.apache.aries.application + org.apache.aries.application.utils + - - org.apache.aries.application - org.apache.aries.application.default.local.platform + + org.apache.aries.application + org.apache.aries.application.default.local.platform - org.apache.aries.application - org.apache.aries.application.modeller + org.apache.aries.application + org.apache.aries.application.modeller - org.apache.aries.application - org.apache.aries.application.deployment.management + org.apache.aries.application + org.apache.aries.application.deployment.management org.apache.aries.application org.apache.aries.application.resolver.obr - + org.apache.aries.application org.apache.aries.application.resolver.noop - - - - - - org.apache.aries.jpa - org.apache.aries.jpa.api - - - - asm - asm-all - - - - org.apache.aries.jpa - org.apache.aries.jpa.container - - - - org.apache.aries.jpa - org.apache.aries.jpa.blueprint.aries - - - - org.apache.aries.jpa - org.apache.aries.jpa.container.context - - - - org.apache.aries.transaction - org.apache.aries.transaction.manager - - - - org.apache.aries.transaction - org.apache.aries.transaction.blueprint - - - - org.apache.aries.transaction - org.apache.aries.transaction.wrappers - - - - - org.apache.aries.samples.blog - org.apache.aries.samples.blog.datasource - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - ${project.build.directory} - - - - filter - generate-resources - - resources - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy-dependencies - - - true - ${project.build.directory} - - - - - - + + + + + + org.apache.aries.jpa + org.apache.aries.jpa.api + + + + asm + asm-all + + + + org.apache.aries.jpa + org.apache.aries.jpa.container + + + + org.apache.aries.jpa + org.apache.aries.jpa.blueprint.aries + + + + org.apache.aries.jpa + org.apache.aries.jpa.container.context + + + + org.apache.aries.transaction + org.apache.aries.transaction.manager + + + + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + + + + org.apache.aries.transaction + org.apache.aries.transaction.wrappers + + + + + org.apache.aries.samples.blog + org.apache.aries.samples.blog.datasource + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.build.directory} + + + + filter + generate-resources + + resources + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + true + ${project.build.directory} + + + + + + diff --git a/samples/blog/blog-biz/pom.xml b/samples/blog/blog-biz/pom.xml index e95acdc4bc..c2039f7735 100644 --- a/samples/blog/blog-biz/pom.xml +++ b/samples/blog/blog-biz/pom.xml @@ -17,27 +17,27 @@ --> - 4.0.0 + 4.0.0 org.apache.aries.samples.blog blog 1.0.1-SNAPSHOT - org.apache.aries.samples.blog.biz - Apache Aries blog sample - bundle + org.apache.aries.samples.blog.biz + Apache Aries blog sample + bundle - - - - org.apache.aries.samples.blog.api;provide:=true, - * - - - org.apache.aries.samples.blog.biz.* - + + + + org.apache.aries.samples.blog.api;provide:=true, + * + + + org.apache.aries.samples.blog.biz.* + diff --git a/samples/blog/blog-comment-ejb/pom.xml b/samples/blog/blog-comment-ejb/pom.xml index 35ac742e1b..539cf51e3f 100644 --- a/samples/blog/blog-comment-ejb/pom.xml +++ b/samples/blog/blog-comment-ejb/pom.xml @@ -1,130 +1,134 @@ - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. +--> - 4.0.0 + 4.0.0 - - org.apache.aries.samples.blog - blog + + org.apache.aries.samples.blog + blog 1.0.1-SNAPSHOT - + - org.apache.aries.samples.blog - org.apache.aries.samples.blog.comment.ejb - Apache Aries blog sample commenting EJB - bundle + org.apache.aries.samples.blog + org.apache.aries.samples.blog.comment.ejb + Apache Aries blog sample commenting EJB + bundle - - - - org.apache.felix - maven-bundle-plugin - - - Commenting + + + + org.apache.felix + maven-bundle-plugin + + + Commenting ${project.artifactId} - org.apache.aries.samples.blog.comment.* + org.apache.aries.samples.blog.comment.* !org.apache.aries.samples.blog.comment.* org.apache.aries.samples.blog.api.comment.persistence;provide:=true,* - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - compile - - - - - - - - - - - - - - - - - - - - run - - - - + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + compile + + + + + + + + + + + + + + + + + + + + run + + + + - - + + - - - org.apache.aries.samples.blog - org.apache.aries.samples.blog.api - provided - - - org.apache.derby - derby - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - - - org.apache.geronimo.specs - geronimo-ejb_3.1_spec - 1.0.2 - - - org.apache.openjpa - openjpa - + + 1.0.2 + + + + org.apache.aries.samples.blog + org.apache.aries.samples.blog.api + provided + + + org.apache.derby + derby + + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + + + org.apache.geronimo.specs + geronimo-ejb_3.1_spec + ${geronimo-ejb_3.1_spec.version} + + + org.apache.openjpa + openjpa + - - - net.sourceforge.serp - serp - provided - - - commons-lang - commons-lang - provided - - - commons-collections - commons-collections - provided - - - + + + net.sourceforge.serp + serp + provided + + + commons-lang + commons-lang + provided + + + commons-collections + commons-collections + provided + + + + diff --git a/samples/blog/blog-datasource/pom.xml b/samples/blog/blog-datasource/pom.xml index c39bc05ae5..a22b7eee3e 100644 --- a/samples/blog/blog-datasource/pom.xml +++ b/samples/blog/blog-datasource/pom.xml @@ -18,30 +18,30 @@ under the License. --> - 4.0.0 + 4.0.0 org.apache.aries.samples.blog blog 1.0.1-SNAPSHOT - org.apache.aries.samples.blog - org.apache.aries.samples.blog.datasource - Apache Aries blog sample transaction enlisting JDBC datasource - bundle + org.apache.aries.samples.blog + org.apache.aries.samples.blog.datasource + Apache Aries blog sample transaction enlisting JDBC datasource + bundle - - - + + + org.apache.aries.samples.blog.datasource - + - + - org.apache.derby - derby + org.apache.derby + derby org.apache.aries.transaction @@ -51,18 +51,18 @@ org.apache.geronimo.components geronimo-transaction - + - - - - OSGI-INF/blueprint - false - ${basedir}/src/main/resources/OSGI-INF/blueprint - - *.xml - - - - + + + + OSGI-INF/blueprint + false + ${basedir}/src/main/resources/OSGI-INF/blueprint + + *.xml + + + + diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index c8a3c3b897..e6d3f8bd1c 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -29,18 +29,30 @@ Integration test for the blog sample - + + 4.0 + 3.2.0-v20070116 + 1.2 3.4.0 - 1.6.0 + 0.9.29 + 2.0.0-SNAPSHOT + 3.8.0.v20120529-1548 + 3.0.0 + 3.1.0 + 3.1.200-v20070605 + 1.7.7 1.7.0 + 2.0.0 + 1.6.0 + 3.16 - + org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} org.osgi @@ -69,7 +81,7 @@ org.apache.aries.testsupport org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} test @@ -96,13 +108,13 @@ org.apache.aries.samples.blog.persistence.jpa test - + org.apache.aries.samples.blog org.apache.aries.samples.blog.persistence.jdbc test - + org.apache.aries.samples.blog org.apache.aries.samples.blog.datasource @@ -132,103 +144,103 @@ org.ow2.asm asm-all - 4.0 + ${asm.version} test - - org.eclipse.equinox - cm - 3.2.0-v20070116 + + org.eclipse.equinox + cm + ${cm.version} test - + - - org.eclipse.osgi - services - 3.1.200-v20070605 + + org.eclipse.osgi + services + ${services.version} test - - - - org.apache.xbean - xbean-asm4-shaded - 3.16 + + + + org.apache.xbean + xbean-asm4-shaded + ${xbean.version} - org.apache.xbean - xbean-finder-shaded - 3.16 + org.apache.xbean + xbean-finder-shaded + ${xbean.version} - - org.ops4j.pax.web - pax-web-extender-war - 3.0.0 + + org.ops4j.pax.web + pax-web-extender-war + ${pax-web-extender-war.version} test - - - org.ops4j.pax.web - pax-web-jetty-bundle - 3.1.0 + + + org.ops4j.pax.web + pax-web-jetty-bundle + ${pax-web-jetty-bundle.version} test - - + - - - org.apache.derby - derby + + + + org.apache.derby + derby test - + - - org.apache.felix - org.apache.felix.fileinstall + + org.apache.felix + org.apache.felix.fileinstall test - + - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec test - + - - org.apache.geronimo.specs - geronimo-jta_1.1_spec + + org.apache.geronimo.specs + geronimo-jta_1.1_spec test - + - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec test - + - - org.apache.geronimo.components - geronimo-transaction + + org.apache.geronimo.components + geronimo-transaction test - + - - org.apache.openjpa - openjpa + + org.apache.openjpa + openjpa test - - - + + + commons-lang commons-lang test - + commons-collections commons-collections @@ -240,136 +252,136 @@ commons-pool test - + org.apache.servicemix.bundles org.apache.servicemix.bundles.serp test - - - org.apache.aries.jndi - org.apache.aries.jndi + + + org.apache.aries.jndi + org.apache.aries.jndi test - + - - org.apache.aries.application - org.apache.aries.application.install + + org.apache.aries.application + org.apache.aries.application.install test - + - - org.apache.aries.application - org.apache.aries.application.api + + org.apache.aries.application + org.apache.aries.application.api test - + - - org.apache.aries.application - org.apache.aries.application.deployment.management + + org.apache.aries.application + org.apache.aries.application.deployment.management test - + - - org.apache.aries.application - org.apache.aries.application.management + + org.apache.aries.application + org.apache.aries.application.management test - + - - org.apache.aries.application - org.apache.aries.application.modeller + + org.apache.aries.application + org.apache.aries.application.modeller test - + - - org.apache.aries.application - org.apache.aries.application.runtime + + org.apache.aries.application + org.apache.aries.application.runtime test - + - - org.apache.aries.application - org.apache.aries.application.utils + + org.apache.aries.application + org.apache.aries.application.utils test - + org.apache.aries.application org.apache.aries.application.default.local.platform test - + org.apache.felix org.apache.felix.bundlerepository test - - org.apache.aries.jpa - org.apache.aries.jpa.api - test - - - - org.apache.aries.jpa - org.apache.aries.jpa.container - test - - - - org.apache.aries.jpa - org.apache.aries.jpa.blueprint.aries - test - - - - org.apache.aries.jpa - org.apache.aries.jpa.container.context - test - - - - org.apache.aries.transaction - org.apache.aries.transaction.manager - test - - - - org.apache.aries.transaction - org.apache.aries.transaction.blueprint - test - - - - org.apache.aries.transaction - org.apache.aries.transaction.wrappers - test - - - - org.apache.aries.quiesce - org.apache.aries.quiesce.api - test - - - - org.apache.aries.quiesce - org.apache.aries.quiesce.manager - test - - - + + org.apache.aries.jpa + org.apache.aries.jpa.api + test + + + + org.apache.aries.jpa + org.apache.aries.jpa.container + test + + + + org.apache.aries.jpa + org.apache.aries.jpa.blueprint.aries + test + + + + org.apache.aries.jpa + org.apache.aries.jpa.container.context + test + + + + org.apache.aries.transaction + org.apache.aries.transaction.manager + test + + + + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + test + + + + org.apache.aries.transaction + org.apache.aries.transaction.wrappers + test + + + + org.apache.aries.quiesce + org.apache.aries.quiesce.api + test + + + + org.apache.aries.quiesce + org.apache.aries.quiesce.manager + test + + + org.apache.aries.application org.apache.aries.application.resolver.obr test - + org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -404,19 +416,19 @@ ch.qos.logback logback-core - 0.9.29 + ${logback.version} test ch.qos.logback logback-classic - 0.9.29 + ${logback.version} test org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} org.osgi.core @@ -429,14 +441,14 @@ junit test - + - + org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file @@ -484,27 +496,27 @@ - - - org.ops4j.pax.swissbox - pax-swissbox-core - ${swissbox.version} - - - org.ops4j.pax.swissbox - pax-swissbox-tracker - ${swissbox.version} - - - org.ops4j.pax.swissbox - pax-swissbox-extender - ${swissbox.version} - - - org.ops4j.pax.swissbox - pax-swissbox-optional-jcl - ${swissbox.version} - - + + + org.ops4j.pax.swissbox + pax-swissbox-core + ${swissbox.version} + + + org.ops4j.pax.swissbox + pax-swissbox-tracker + ${swissbox.version} + + + org.ops4j.pax.swissbox + pax-swissbox-extender + ${swissbox.version} + + + org.ops4j.pax.swissbox + pax-swissbox-optional-jcl + ${swissbox.version} + + diff --git a/samples/blog/blog-jdbc-eba/pom.xml b/samples/blog/blog-jdbc-eba/pom.xml index f25424c7aa..0f44a3715e 100644 --- a/samples/blog/blog-jdbc-eba/pom.xml +++ b/samples/blog/blog-jdbc-eba/pom.xml @@ -33,9 +33,9 @@ under the License. org.apache.aries.samples.blog.jdbc.eba Apache Aries Blog Sample EBA using JDBC - This EBA contains the core bundles for the sample Blog application. - It does not include all transitive dependencies, which need to - be provisioned during deployment. It uses JDBC for the persistence layer. + This EBA contains the core bundles for the sample Blog application. + It does not include all transitive dependencies, which need to + be provisioned during deployment. It uses JDBC for the persistence layer. eba diff --git a/samples/blog/blog-jpa-eba/pom.xml b/samples/blog/blog-jpa-eba/pom.xml index 14ac0847d1..92b10516c3 100644 --- a/samples/blog/blog-jpa-eba/pom.xml +++ b/samples/blog/blog-jpa-eba/pom.xml @@ -33,9 +33,9 @@ under the License. org.apache.aries.samples.blog.jpa.eba Apache Aries Blog Sample EBA using JPA - This EBA contains the core bundles for the sample Blog application. - It does not include all transitive dependencies, which need to - be provisioned during deployment. It uses JPA for the persistence layer. + This EBA contains the core bundles for the sample Blog application. + It does not include all transitive dependencies, which need to + be provisioned during deployment. It uses JPA for the persistence layer. eba diff --git a/samples/blog/blog-persistence-jdbc/pom.xml b/samples/blog/blog-persistence-jdbc/pom.xml index 2369a607e0..0a453de6e5 100644 --- a/samples/blog/blog-persistence-jdbc/pom.xml +++ b/samples/blog/blog-persistence-jdbc/pom.xml @@ -32,15 +32,15 @@ - - - - org.apache.aries.samples.blog.api.persistence;provide:=true, - * - - - org.apache.aries.samples.blog.persistence.jdbc.* - + + + + org.apache.aries.samples.blog.api.persistence;provide:=true, + * + + + org.apache.aries.samples.blog.persistence.jdbc.* + diff --git a/samples/blog/blog-persistence-jpa/pom.xml b/samples/blog/blog-persistence-jpa/pom.xml index 8e161ea959..8fe1944992 100644 --- a/samples/blog/blog-persistence-jpa/pom.xml +++ b/samples/blog/blog-persistence-jpa/pom.xml @@ -1,127 +1,127 @@ - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. +--> - 4.0.0 + 4.0.0 - - org.apache.aries.samples.blog - blog + + org.apache.aries.samples.blog + blog 1.0.1-SNAPSHOT - + - org.apache.aries.samples.blog - org.apache.aries.samples.blog.persistence.jpa - Apache Aries blog sample persistence - bundle + org.apache.aries.samples.blog + org.apache.aries.samples.blog.persistence.jpa + Apache Aries blog sample persistence + bundle - - - - org.apache.felix - maven-bundle-plugin - - - META-INF/persistence.xml + + + + org.apache.felix + maven-bundle-plugin + + + META-INF/persistence.xml ${project.artifactId} - org.apache.aries.samples.blog.persistence.jpa.* + org.apache.aries.samples.blog.persistence.jpa.* !org.apache.aries.samples.blog.persistence.jpa.* org.apache.aries.samples.blog.api.persistence;provide:=true,* - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - compile - - - - - - - - - - - - - - - - - - - - - run - - - - + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + compile + + + + + + + + + + + + + + + + + + + + + run + + + + - - + + - - - org.apache.aries.samples.blog - org.apache.aries.samples.blog.api - provided - - - org.apache.derby - derby - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - + + + org.apache.aries.samples.blog + org.apache.aries.samples.blog.api + provided + + + org.apache.derby + derby + + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + - - org.apache.openjpa - openjpa - + + org.apache.openjpa + openjpa + - - - net.sourceforge.serp - serp - provided - - - commons-lang - commons-lang - provided - - - commons-collections - commons-collections - provided - - + + + net.sourceforge.serp + serp + provided + + + commons-lang + commons-lang + provided + + + commons-collections + commons-collections + provided + + - + diff --git a/samples/blog/blog-web/pom.xml b/samples/blog/blog-web/pom.xml index 2cb5c9138a..ed5b4ec434 100644 --- a/samples/blog/blog-web/pom.xml +++ b/samples/blog/blog-web/pom.xml @@ -58,7 +58,7 @@ <_wab>src/main/webapp/ - + diff --git a/samples/blog/pom.xml b/samples/blog/pom.xml index e2e0bbbaeb..0f88460d6c 100644 --- a/samples/blog/pom.xml +++ b/samples/blog/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.apache.aries.samples @@ -28,7 +28,11 @@ blog Apache Aries blog sample pom - + + + 3.7.0.v20110613 + + @@ -68,7 +72,7 @@ org.apache.aries.samples.blog.persistence.jdbc ${project.version} - + org.apache.aries.samples.blog org.apache.aries.samples.blog.persistence.jpa ${project.version} @@ -78,11 +82,11 @@ org.apache.aries.samples.blog.web ${project.version} - + org.eclipse.tycho org.eclipse.osgi - 3.7.0.v20110613 + ${org.eclipse.osgi.version} diff --git a/samples/blueprint/helloworld/helloworld-assembly/pom.xml b/samples/blueprint/helloworld/helloworld-assembly/pom.xml index ed6722f7c8..42e5b5e0e6 100644 --- a/samples/blueprint/helloworld/helloworld-assembly/pom.xml +++ b/samples/blueprint/helloworld/helloworld-assembly/pom.xml @@ -28,24 +28,30 @@ Apache Aries Blueprint HelloWorld Assembly pom + + 3.5.0.v20090520 + 3.2.0-v20070116 + 3.1.200-v20070605 + + org.eclipse osgi - 3.5.0.v20090520 + ${osgi.version} org.eclipse.equinox cm - 3.2.0-v20070116 + ${cm.version} org.eclipse.osgi services - 3.1.200-v20070605 + ${services.version} @@ -104,14 +110,14 @@ ${project.build.directory} - - filter - generate-resources - - resources - - - + + filter + generate-resources + + resources + + + diff --git a/samples/blueprint/helloworld/helloworld-client/pom.xml b/samples/blueprint/helloworld/helloworld-client/pom.xml index c5ef1af252..85dc95df60 100644 --- a/samples/blueprint/helloworld/helloworld-client/pom.xml +++ b/samples/blueprint/helloworld/helloworld-client/pom.xml @@ -1,52 +1,52 @@ - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. +--> - 4.0.0 - - org.apache.aries.samples - helloworld - 1.0.1-SNAPSHOT - + 4.0.0 + + org.apache.aries.samples + helloworld + 1.0.1-SNAPSHOT + org.apache.aries.samples.blueprint.helloworld - org.apache.aries.samples.blueprint.helloworld.client - Apache Aries Blueprint HelloWorldClient - bundle - Example blueprint hello world client application. + org.apache.aries.samples.blueprint.helloworld.client + Apache Aries Blueprint HelloWorldClient + bundle + Example blueprint hello world client application. - - - - org.apache.felix - maven-bundle-plugin + + + + org.apache.felix + maven-bundle-plugin - - - ${project.artifactId} - - - - - - - - org.apache.aries.samples.blueprint.helloworld - org.apache.aries.samples.blueprint.helloworld.api - - + + + ${project.artifactId} + + + + + + + + org.apache.aries.samples.blueprint.helloworld + org.apache.aries.samples.blueprint.helloworld.api + + diff --git a/samples/blueprint/helloworld/helloworld-eba/pom.xml b/samples/blueprint/helloworld/helloworld-eba/pom.xml index 28a00db57e..a1c6a1671f 100644 --- a/samples/blueprint/helloworld/helloworld-eba/pom.xml +++ b/samples/blueprint/helloworld/helloworld-eba/pom.xml @@ -36,18 +36,18 @@ under the License. eba - - org.apache.aries.samples.blueprint.helloworld - org.apache.aries.samples.blueprint.helloworld.api - - - org.apache.aries.samples.blueprint.helloworld - org.apache.aries.samples.blueprint.helloworld.client - - - org.apache.aries.samples.blueprint.helloworld - org.apache.aries.samples.blueprint.helloworld.server - + + org.apache.aries.samples.blueprint.helloworld + org.apache.aries.samples.blueprint.helloworld.api + + + org.apache.aries.samples.blueprint.helloworld + org.apache.aries.samples.blueprint.helloworld.client + + + org.apache.aries.samples.blueprint.helloworld + org.apache.aries.samples.blueprint.helloworld.server + diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml index 26e4d9e6df..7bee88dc15 100644 --- a/samples/blueprint/helloworld/helloworld-itests/pom.xml +++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml @@ -31,6 +31,19 @@ Integration test for the blueprint hello world sample + + 4.0 + 0.0.357 + 3.2.0-v20070116 + 1.0.0 + 3.5.0.v20090520 + 1.2.4 + 1.4.0 + 1.2.0 + 1.3.5 + 3.1.200-v20070605 + + org.osgi @@ -47,7 +60,7 @@ org.eclipse osgi - 3.5.0.v20090520 + ${osgi.version} provided @@ -56,17 +69,17 @@ org.apache.aries.blueprint test - - + + biz.aQute bndlib - 0.0.357 + ${bndlib.version} org.apache.aries.proxy org.apache.aries.proxy - 1.0.0 + ${org.apache.aries.proxy.version} test @@ -97,41 +110,41 @@ org.ops4j.pax.exam pax-exam - 1.2.4 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-junit - 1.2.4 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-container-default - 1.2.4 + ${pax-exam.version} test org.ops4j.pax.exam pax-exam-junit-extender-impl - 1.2.4 + ${pax-exam.version} test org.ops4j.pax.runner pax-runner-no-jcl - 1.4.0 + ${pax-runner-no-jcl.version} org.ops4j.pax.swissbox pax-swissbox-tinybundles - 1.2.0 + ${pax-swissbox-tinybundles.version} @@ -161,7 +174,7 @@ org.ops4j.pax.url pax-url-mvn - 1.3.5 + ${pax-url-mvn.version} test @@ -174,25 +187,25 @@ org.ow2.asm asm-all - 4.0 + ${asm.version} + test + + + + org.eclipse.equinox + cm + ${cm.version} + test + + + + org.eclipse.osgi + services + ${services.version} test - - org.eclipse.equinox - cm - 3.2.0-v20070116 - test - - - - org.eclipse.osgi - services - 3.1.200-v20070605 - test - - - + diff --git a/samples/blueprint/helloworld/helloworld-server/pom.xml b/samples/blueprint/helloworld/helloworld-server/pom.xml index 4d4cbc034c..7345299230 100644 --- a/samples/blueprint/helloworld/helloworld-server/pom.xml +++ b/samples/blueprint/helloworld/helloworld-server/pom.xml @@ -41,8 +41,8 @@ ${project.artifactId} - org.apache.aries.samples.blueprint.helloworld.api;provide:=true, - * + org.apache.aries.samples.blueprint.helloworld.api;provide:=true, + * @@ -51,8 +51,8 @@ - org.apache.aries.samples.blueprint.helloworld - org.apache.aries.samples.blueprint.helloworld.api + org.apache.aries.samples.blueprint.helloworld + org.apache.aries.samples.blueprint.helloworld.api diff --git a/samples/blueprint/helloworld/pom.xml b/samples/blueprint/helloworld/pom.xml index 4ae6991500..d41ef5a73c 100644 --- a/samples/blueprint/helloworld/pom.xml +++ b/samples/blueprint/helloworld/pom.xml @@ -1,35 +1,35 @@ - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. +--> - 4.0.0 + 4.0.0 - - org.apache.aries.samples - blueprint + + org.apache.aries.samples + blueprint 1.0.1-SNAPSHOT - helloworld - Apache Aries Blueprint HelloWorld - pom - Example blueprint hello world application + helloworld + Apache Aries Blueprint HelloWorld + pom + Example blueprint hello world application - + org.apache.aries.samples.blueprint.helloworld @@ -57,15 +57,15 @@ ${project.version} - + - - helloworld-api - helloworld-server - helloworld-client - helloworld-assembly + + helloworld-api + helloworld-server + helloworld-client + helloworld-assembly helloworld-eba helloworld-itests - + diff --git a/samples/blueprint/idverifier/idverifier-api/pom.xml b/samples/blueprint/idverifier/idverifier-api/pom.xml index 052535d251..26f7819c20 100644 --- a/samples/blueprint/idverifier/idverifier-api/pom.xml +++ b/samples/blueprint/idverifier/idverifier-api/pom.xml @@ -19,8 +19,8 @@ 4.0.0 org.apache.aries.samples.blueprint.idverifier - idverifier - 1.0.1-SNAPSHOT + idverifier + 1.0.1-SNAPSHOT org.apache.aries.samples.blueprint.idverifier.api @@ -42,5 +42,5 @@ - + diff --git a/samples/blueprint/idverifier/idverifier-assembly/pom.xml b/samples/blueprint/idverifier/idverifier-assembly/pom.xml index fbe463f567..57b864a174 100644 --- a/samples/blueprint/idverifier/idverifier-assembly/pom.xml +++ b/samples/blueprint/idverifier/idverifier-assembly/pom.xml @@ -19,137 +19,137 @@ --> - 4.0.0 - - - org.apache.aries.samples.blueprint.idverifier - idverifier - 1.0.1-SNAPSHOT - - - org.apache.aries.samples.blueprint.idverifier.assembly - Apache Aries Blueprint Sample - ID Verifier Assembly - pom - - - - - org.apache.felix - org.apache.felix.main - - - - org.apache.felix - org.apache.felix.shell - - - - org.apache.felix - org.apache.felix.shell.tui - - - - org.apache.felix - org.apache.felix.configadmin - - - - org.apache.felix - org.apache.felix.eventadmin - - - - org.ops4j.pax.logging - pax-logging-api - - - - org.ops4j.pax.logging - pax-logging-service - - - - org.apache.aries.proxy - org.apache.aries.proxy - - - - org.apache.aries.blueprint - org.apache.aries.blueprint - - - - org.apache.aries - org.apache.aries.util - - - org.apache.aries.jmx - org.apache.aries.jmx.blueprint - - - asm - asm-all - - - - org.apache.aries.samples.blueprint.idverifier - org.apache.aries.samples.blueprint.idverifier.api + 4.0.0 + + + org.apache.aries.samples.blueprint.idverifier + idverifier + 1.0.1-SNAPSHOT + + + org.apache.aries.samples.blueprint.idverifier.assembly + Apache Aries Blueprint Sample - ID Verifier Assembly + pom + + + + + org.apache.felix + org.apache.felix.main + + + + org.apache.felix + org.apache.felix.shell + + + + org.apache.felix + org.apache.felix.shell.tui + + + + org.apache.felix + org.apache.felix.configadmin + + + + org.apache.felix + org.apache.felix.eventadmin + + + + org.ops4j.pax.logging + pax-logging-api + + + + org.ops4j.pax.logging + pax-logging-service + + + + org.apache.aries.proxy + org.apache.aries.proxy + + + + org.apache.aries.blueprint + org.apache.aries.blueprint + + + + org.apache.aries + org.apache.aries.util + + + org.apache.aries.jmx + org.apache.aries.jmx.blueprint + + + asm + asm-all + + + + org.apache.aries.samples.blueprint.idverifier + org.apache.aries.samples.blueprint.idverifier.api ${project.version} - + - - org.apache.aries.samples.blueprint.idverifier - org.apache.aries.samples.blueprint.idverifier.server + + org.apache.aries.samples.blueprint.idverifier + org.apache.aries.samples.blueprint.idverifier.server ${project.version} - + - - org.apache.aries.samples.blueprint.idverifier - org.apache.aries.samples.blueprint.idverifier.client + + org.apache.aries.samples.blueprint.idverifier + org.apache.aries.samples.blueprint.idverifier.client ${project.version} - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - ${project.build.directory} - - - - filter - generate-resources - - resources - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy-dependencies - - - true - ${project.build.directory}/bundles - - - - - - + + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.build.directory} + + + + filter + generate-resources + + resources + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + true + ${project.build.directory}/bundles + + + + + + diff --git a/samples/blueprint/idverifier/idverifier-client/pom.xml b/samples/blueprint/idverifier/idverifier-client/pom.xml index 354cb07189..f9d333936e 100644 --- a/samples/blueprint/idverifier/idverifier-client/pom.xml +++ b/samples/blueprint/idverifier/idverifier-client/pom.xml @@ -29,11 +29,15 @@ Example blueprint application to demo inlined managers definitions. + + 3.5.0.v20090520 + + org.eclipse osgi - 3.5.0.v20090520 + ${osgi.version} provided @@ -62,8 +66,8 @@ ${project.artifactId};blueprint.graceperiod:=true;blueprint.timeout:= 60000 org.apache.aries.samples.blueprint.idverifier.client.IDVerifierClientActivator - org.apache.aries.samples.blueprint.idverifier.api;provide:=true, - * + org.apache.aries.samples.blueprint.idverifier.api;provide:=true, + * diff --git a/samples/blueprint/idverifier/idverifier-server/pom.xml b/samples/blueprint/idverifier/idverifier-server/pom.xml index 1725c5e152..bec6f4525e 100644 --- a/samples/blueprint/idverifier/idverifier-server/pom.xml +++ b/samples/blueprint/idverifier/idverifier-server/pom.xml @@ -18,17 +18,21 @@ 4.0.0 org.apache.aries.samples.blueprint.idverifier - idverifier - 1.0.1-SNAPSHOT + idverifier + 1.0.1-SNAPSHOT org.apache.aries.samples.blueprint.idverifier.server Apache Aries Blueprint Sample - ID Verifier Server bundle - Example blueprint application to demo inlined managers definitions. + Example blueprint application to demo inlined managers definitions. + + 3.5.0.v20090520 + + @@ -36,10 +40,10 @@ maven-bundle-plugin - ${project.artifactId} + ${project.artifactId} - org.apache.aries.samples.blueprint.idverifier.api;provide:=true, - * + org.apache.aries.samples.blueprint.idverifier.api;provide:=true, + * @@ -51,14 +55,14 @@ org.eclipse osgi - 3.5.0.v20090520 + ${osgi.version} provided - - org.apache.aries.blueprint - org.apache.aries.blueprint.api - - + + org.apache.aries.blueprint + org.apache.aries.blueprint.api + + org.apache.aries.samples.blueprint.idverifier org.apache.aries.samples.blueprint.idverifier.api ${project.version} diff --git a/samples/blueprint/idverifier/pom.xml b/samples/blueprint/idverifier/pom.xml index f465aa0280..06e72a8d2d 100644 --- a/samples/blueprint/idverifier/pom.xml +++ b/samples/blueprint/idverifier/pom.xml @@ -32,7 +32,6 @@ - org.apache.aries.samples.blueprint.idverifier org.apache.aries.samples.blueprint.idverifier.api @@ -54,7 +53,6 @@ org.apache.aries.samples.blueprint.idverifier.server ${project.version} - diff --git a/samples/blueprint/pom.xml b/samples/blueprint/pom.xml index 18774fca85..3f4356ba8c 100644 --- a/samples/blueprint/pom.xml +++ b/samples/blueprint/pom.xml @@ -44,7 +44,7 @@ - helloworld - idverifier + helloworld + idverifier diff --git a/samples/twitter/pom.xml b/samples/twitter/pom.xml index 9b84ccfa63..bc9bb0be35 100644 --- a/samples/twitter/pom.xml +++ b/samples/twitter/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.apache.aries.samples @@ -28,11 +28,11 @@ Apache Aries Twitter sample twitter pom - + - true + true - + @@ -57,9 +57,9 @@ twitter-twitter4j - twitter-bundle - twitter-eba - twitter-itests + twitter-bundle + twitter-eba + twitter-itests diff --git a/samples/twitter/twitter-bundle/pom.xml b/samples/twitter/twitter-bundle/pom.xml index 7d5c1313ca..b2d40e4b8c 100644 --- a/samples/twitter/twitter-bundle/pom.xml +++ b/samples/twitter/twitter-bundle/pom.xml @@ -17,16 +17,16 @@ --> - 4.0.0 + 4.0.0 org.apache.aries.samples.twitter twitter 1.0.1-SNAPSHOT - org.apache.aries.samples.twitter.bundle - Apache Aries Twitter bundle - bundle + org.apache.aries.samples.twitter.bundle + Apache Aries Twitter bundle + bundle @@ -50,21 +50,21 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.apache.aries.sample.twitter.TwitterQuery - org.apache.aries.sample.twitter - org.osgi.framework;version="[1.5,2)",* - - - - - + + + + org.apache.felix + maven-bundle-plugin + + + ${project.artifactId} + org.apache.aries.sample.twitter.TwitterQuery + org.apache.aries.sample.twitter + org.osgi.framework;version="[1.5,2)",* + + + + + diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml index e3996fb13e..0ef404f5da 100644 --- a/samples/twitter/twitter-itests/pom.xml +++ b/samples/twitter/twitter-itests/pom.xml @@ -23,7 +23,7 @@ org.apache.aries.samples.twitter 1.0.1-SNAPSHOT - + 4.0.0 org.apache.aries.samples.twitter.itests jar @@ -31,40 +31,46 @@ Integration tests for the Twitter sample - + + 4.0 + 1.2 3.4.0 - 1.6.0 + 0.9.29 + 2.0.0-SNAPSHOT + 3.8.0.v20120529-1548 1.7.0 + 2.0.0 + 1.6.0 - + - + org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 - - - org.apache.aries - org.apache.aries.util - test - - - org.apache.aries.blueprint - org.apache.aries.blueprint - test - - - org.apache.aries.proxy - org.apache.aries.proxy - test - - - org.ow2.asm + ${org.eclipse.osgi.version} + + + org.apache.aries + org.apache.aries.util + test + + + org.apache.aries.blueprint + org.apache.aries.blueprint + test + + + org.apache.aries.proxy + org.apache.aries.proxy + test + + + org.ow2.asm asm-all - 4.0 - test - + ${asm.version} + test + org.apache.felix org.apache.felix.bundlerepository @@ -74,7 +80,7 @@ org.osgi org.osgi.compendium test - + org.apache.aries.application org.apache.aries.application.utils @@ -83,7 +89,7 @@ org.apache.aries.testsupport org.apache.aries.testsupport.unit - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} test @@ -98,29 +104,29 @@ test - org.apache.aries.application - org.apache.aries.application.runtime.framework - test + org.apache.aries.application + org.apache.aries.application.runtime.framework + test - org.apache.aries.application - org.apache.aries.application.runtime.framework.management - test + org.apache.aries.application + org.apache.aries.application.runtime.framework.management + test - org.apache.aries.application - org.apache.aries.application.runtime.repository - test + org.apache.aries.application + org.apache.aries.application.runtime.repository + test - org.apache.aries.application - org.apache.aries.application.runtime.isolated - test + org.apache.aries.application + org.apache.aries.application.runtime.isolated + test - org.apache.aries.application - org.apache.aries.application.runtime - test + org.apache.aries.application + org.apache.aries.application.runtime + test org.apache.aries.application @@ -133,41 +139,41 @@ test - org.apache.aries.application - org.apache.aries.application.default.local.platform - test + org.apache.aries.application + org.apache.aries.application.default.local.platform + test - org.apache.aries.transaction - org.apache.aries.transaction.blueprint - test + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + test - org.apache.geronimo.specs - geronimo-jta_1.1_spec - test + org.apache.geronimo.specs + geronimo-jta_1.1_spec + test - org.apache.aries.samples.twitter - org.apache.aries.samples.twitter.eba - test - eba + org.apache.aries.samples.twitter + org.apache.aries.samples.twitter.eba + test + eba org.apache.aries.samples.twitter org.apache.aries.samples.twitter.twitter4j - - nlog4j - org.slf4j - + + nlog4j + org.slf4j + org.apache.aries.samples.twitter org.apache.aries.samples.twitter.bundle - + org.slf4j @@ -206,19 +212,19 @@ ch.qos.logback logback-core - 0.9.29 + ${logback.version} test ch.qos.logback logback-classic - 0.9.29 + ${logback.version} test org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} org.osgi.core @@ -235,10 +241,10 @@ - + org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file diff --git a/samples/twitter/twitter-twitter4j/pom.xml b/samples/twitter/twitter-twitter4j/pom.xml index ac2c566632..968abd7aca 100644 --- a/samples/twitter/twitter-twitter4j/pom.xml +++ b/samples/twitter/twitter-twitter4j/pom.xml @@ -27,29 +27,34 @@ bundle Apache Aries Bundlise Twitter4j - Module used to bundlelise twitter4j + Module used to bundlelise twitter4j + + + 2.3.5 + + net.homeip.yusuke twitter4j - - - - - org.apache.felix - maven-bundle-plugin - 2.3.5 - true - - - dalvik.system;resolution:=optional,* - !twitter4j.examples,* - - - - + + + + + org.apache.felix + maven-bundle-plugin + ${maven-bundle-plugin.version} + true + + + dalvik.system;resolution:=optional,* + !twitter4j.examples,* + + + + diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml index 0a35f4ec66..9496252e39 100644 --- a/spi-fly/pom.xml +++ b/spi-fly/pom.xml @@ -25,7 +25,7 @@ org.apache apache 30 - + org.apache.aries.spifly @@ -46,6 +46,9 @@ apache.releases.https + 1.8 + 1.8 + 1.8 0.16.1 9.7.1 @@ -56,18 +59,19 @@ 1.0.0 1.3.0 1.0.6 + 1.6.0 5.11.4 1.11.4 + 4.13.2 3.13.0 + 3.8.1 + 3.1.0 + 3.5.2 5.15.2 + 0.3.1 5.0.0 1.3.0 2.0.16 - - 1.8 - 1.8 - - 1.8 @@ -97,7 +101,7 @@ junit junit - 4.13.2 + ${junit.version} test @@ -108,7 +112,7 @@ org.apache.aries.versioning org.apache.aries.versioning.plugin - 0.3.1 + ${org.apache.aries.versioning.plugin.version} org.apache.maven.plugins @@ -126,17 +130,17 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.1 + ${maven-dependency-plugin.version} org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + ${maven-enforcer-plugin.version} org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + ${maven-surefire-plugin.version} true once @@ -164,7 +168,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + ${flatten-maven-plugin.version} oss @@ -190,6 +194,7 @@ + java-above-8 [9,) @@ -202,7 +207,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + ${maven-surefire-plugin.version} true once diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml index fcf6c55b4f..d7f06283f7 100644 --- a/spi-fly/spi-fly-core/pom.xml +++ b/spi-fly/spi-fly-core/pom.xml @@ -44,6 +44,10 @@ HEAD + + 5.5.0 + + org.osgi @@ -68,7 +72,7 @@ org.easymock easymock - 5.5.0 + ${easymock.version} test diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml index cb640076e1..46dc1cd6bb 100644 --- a/spi-fly/spi-fly-dynamic-bundle/pom.xml +++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml @@ -43,6 +43,10 @@ HEAD + + 3.3.0 + + org.ow2.asm @@ -235,7 +239,7 @@ unpack package - unpack + unpack @@ -273,7 +277,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + ${build-helper-maven-plugin.version} add-source diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml index 71ff66ddde..1713900418 100644 --- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml +++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml @@ -43,6 +43,10 @@ HEAD + + 3.3.0 + + org.ow2.asm @@ -238,7 +242,7 @@ unpack package - unpack + unpack @@ -303,7 +307,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + ${build-helper-maven-plugin.version} add-source diff --git a/spi-fly/spi-fly-examples/pom.xml b/spi-fly/spi-fly-examples/pom.xml index 8766901d31..98ecd7b3d1 100644 --- a/spi-fly/spi-fly-examples/pom.xml +++ b/spi-fly/spi-fly-examples/pom.xml @@ -41,14 +41,15 @@ true true none + 5.1.8 scm:git:https://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - HEAD - + HEAD + spi-fly-example-spi-bundle @@ -67,7 +68,7 @@ spi-fly-example-resource-client-bundle - + org.osgi @@ -83,7 +84,7 @@ org.apache.felix maven-bundle-plugin - 5.1.8 + ${maven-bundle-plugin.version} true diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml index 981e785a9d..59a7bceb01 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -56,7 +56,7 @@ - + 1.0.0 @@ -70,8 +70,8 @@ * - - <_exportcontents /> + + <_exportcontents/> org.apache.aries.spifly.client.bundle diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml index bd389b4242..269121212b 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -39,6 +39,6 @@ org.apache.aries.spifly.examples org.apache.aries.spifly.examples.spi.bundle ${project.version} - + diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml index 9feef44cea..ea5a06b505 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -31,7 +31,7 @@ bundle Apache Aries Example SPI Client Bundle 2 - A Bundle that uses the java.util.ServiceLoader() API + A Bundle that uses the java.util.ServiceLoader() API @@ -39,18 +39,18 @@ org.osgi osgi.core provided - + org.apache.aries.spifly.examples org.apache.aries.spifly.examples.spi.bundle ${project.version} provided - + - + 1.0.0 @@ -64,7 +64,7 @@ * - + org.apache.aries.spifly.examples.client2.impl diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml index 0ea76324e8..8500146a97 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -51,7 +51,7 @@ - + 1.0.1-SNAPSHOT @@ -65,7 +65,7 @@ * - + org.apache.aries.spifly.examples.client3.impl diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client3-fragment/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client3-fragment/pom.xml index bb541763dc..02075df3f2 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-client3-fragment/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-client3-fragment/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -35,7 +35,7 @@ - + 1.0.1-SNAPSHOT @@ -47,10 +47,10 @@ org.apache.aries.spifly.examples.client3.bundle - - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.apache.aries.spifly.mysvc.SPIProvider)";cardinality:=multiple,osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)" + + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.apache.aries.spifly.mysvc.SPIProvider)";cardinality:=multiple,osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)" diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml index 69e9c451a3..8e08363f30 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -62,8 +62,8 @@ - - + + true @@ -80,7 +80,7 @@ * - + org.apache.aries.spifly.pc.bundle *;scope=compile;inline=false org.apache.aries.spifly.pc.bundle.Activator diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml index de0c13d51b..5d7a3f8d8e 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -50,8 +50,8 @@ - - + + 1.0.0 @@ -65,9 +65,9 @@ * - - <_exportcontents /> - + + <_exportcontents/> + *;scope=compile;inline=false * diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml index affb7516fc..3b74c28ffa 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -39,6 +39,6 @@ org.apache.aries.spifly.examples org.apache.aries.spifly.examples.spi.bundle ${project.version} - + diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml index 63df40498d..0ee2a0f95c 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -40,11 +40,11 @@ org.apache.aries.spifly.examples.spi.bundle ${project.version} provided - + - + 1.0.0 diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider3-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider3-bundle/pom.xml index 608e2fe0f1..318b7825d9 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-provider3-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-provider3-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -40,11 +40,11 @@ org.apache.aries.spifly.examples.spi.bundle ${project.version} provided - + - + 1.0.1-SNAPSHOT diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider3-fragment/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider3-fragment/pom.xml index 815d12a360..987fc64163 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-provider3-fragment/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-provider3-fragment/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -35,7 +35,7 @@ - + 1.0.1-SNAPSHOT @@ -47,9 +47,9 @@ org.apache.aries.spifly.examples.provider3.bundle - - - + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" osgi.serviceloader; osgi.serviceloader=org.apache.aries.spifly.mysvc.SPIProvider diff --git a/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml index e9aa7cdac9..a20769fecd 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -43,7 +43,7 @@ - + 1.0.0 @@ -57,7 +57,7 @@ * - + org.apache.aries.spifly.example.resource.client diff --git a/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml index 70634ad76e..dd3ed28b43 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -35,9 +35,9 @@ - - - + + + 1.0.0 @@ -48,9 +48,9 @@ maven-bundle-plugin - - - + + + org.apache.aries.spifly.example.resource.client.Foo diff --git a/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml index a092cf0a3f..38834d7b65 100644 --- a/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml +++ b/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml @@ -1,24 +1,24 @@ - +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> 4.0.0 @@ -31,11 +31,11 @@ bundle Apache Aries Example SPI Interface - This is the API implemented by example SPI providers and used by the example SPI client + This is the API implemented by example SPI providers and used by the example SPI client - + 1.0.0 diff --git a/spi-fly/spi-fly-itests/pom.xml b/spi-fly/spi-fly-itests/pom.xml index 5374c57b7f..4039b88056 100644 --- a/spi-fly/spi-fly-itests/pom.xml +++ b/spi-fly/spi-fly-itests/pom.xml @@ -34,6 +34,8 @@ true true + + 1.0.6-SNAPSHOT @@ -90,7 +92,7 @@ org.apache.aries.spifly.examples org.apache.aries.spifly.examples.spi.bundle - 1.0.6-SNAPSHOT + ${org.apache.aries.spifly.examples.spi.bundle.version} test diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml index b7bd110ed3..b5809061a5 100644 --- a/spi-fly/spi-fly-static-bundle/pom.xml +++ b/spi-fly/spi-fly-static-bundle/pom.xml @@ -43,6 +43,10 @@ HEAD + + 3.3.0 + + org.apache.aries.spifly @@ -199,7 +203,7 @@ unpack package - unpack + unpack @@ -237,7 +241,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + ${build-helper-maven-plugin.version} add-source diff --git a/spi-fly/spi-fly-weaver/pom.xml b/spi-fly/spi-fly-weaver/pom.xml index f8f7b22e45..fef1b6aa64 100644 --- a/spi-fly/spi-fly-weaver/pom.xml +++ b/spi-fly/spi-fly-weaver/pom.xml @@ -68,7 +68,7 @@ org.easymock easymock - 5.5.0 + ${easymock.version} test diff --git a/subsystem/subsystem-api/pom.xml b/subsystem/subsystem-api/pom.xml index 0c0b03e688..37b4e1910a 100644 --- a/subsystem/subsystem-api/pom.xml +++ b/subsystem/subsystem-api/pom.xml @@ -49,33 +49,38 @@ org.osgi.service.subsystem - org.osgi.service.repository;version="[1.0,1.1)", - org.osgi.service.subsystem;version="[1.1,1.2)", - * - + org.osgi.service.repository;version="[1.0,1.1)", + org.osgi.service.subsystem;version="[1.1,1.2)", + * + + + 1.1.1 + 6.0.0 + 6.0.0 + 5.0.0 org.apache.aries org.apache.aries.util - 1.1.1 + ${org.apache.aries.util.version} org.osgi org.osgi.core - 6.0.0 + ${org.osgi.core.version} provided org.osgi org.osgi.annotation - 6.0.0 + ${org.osgi.annotation.version} org.osgi org.osgi.enterprise - 5.0.0 + ${org.osgi.enterprise.version} provided diff --git a/subsystem/subsystem-bundle/pom.xml b/subsystem/subsystem-bundle/pom.xml index 11e1240026..f8724696f4 100644 --- a/subsystem/subsystem-bundle/pom.xml +++ b/subsystem/subsystem-bundle/pom.xml @@ -45,7 +45,7 @@ org.apache.aries.subsystem.core.internal.Activator - + 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.* 1.0.0 + + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.1 + 2.0.10 + 2.0.10 + 1.1.1 + 1.0.0 + 1.1.0.v20120522-1841 + 1.2.101.v20150831-1342 + 3.10.0.v20140606-1445 org.apache.aries.subsystem org.apache.aries.subsystem.api - 2.0.10 + ${org.apache.aries.subsystem.api.version} org.apache.aries.subsystem org.apache.aries.subsystem.core - 2.0.10 + ${org.apache.aries.subsystem.core.version} org.apache.aries org.apache.aries.util - 1.1.1 + ${org.apache.aries.util.version} org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.modeller - 1.0.0 + ${org.apache.aries.application.modeller.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.aries.blueprint org.apache.aries.blueprint - 1.0.0 + ${org.apache.aries.blueprint.version} org.apache.aries.proxy org.apache.aries.proxy - 1.0.1 + ${org.apache.aries.proxy.version} org.apache.felix org.apache.felix.resolver - 1.0.0 + ${org.apache.felix.resolver.version} org.eclipse.equinox org.eclipse.equinox.coordinator - 1.1.0.v20120522-1841 + ${org.eclipse.equinox.coordinator.version} org.eclipse.equinox org.eclipse.equinox.region - 1.2.101.v20150831-1342 + ${org.eclipse.equinox.region.version} org.eclipse.tycho org.eclipse.osgi - 3.10.0.v20140606-1445 + ${org.eclipse.osgi.version} diff --git a/subsystem/subsystem-core/pom.xml b/subsystem/subsystem-core/pom.xml index b8079ee99c..c812803575 100644 --- a/subsystem/subsystem-core/pom.xml +++ b/subsystem/subsystem-core/pom.xml @@ -45,75 +45,87 @@ org.apache.aries.subsystem.core.internal.Activator - + org.osgi.service.subsystem;version="[1.1,1.2)", org.apache.aries.subsystem;version="[1.2,1.3)", org.apache.aries.application.*;resolution:=optional, * - + org.apache.aries.subsystem.core.* 1.0.0 - osgi.implementation; - osgi.implementation="osgi.subsystem"; - version:Version="1.1"; - uses:="org.osgi.service.subsystem", - osgi.service; - objectClass:List<String>="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<String>="org.osgi.service.subsystem.Subsystem,org.apache.aries.subsystem.AriesSubsystem"; + uses:="org.osgi.service.subsystem,org.apache.aries.subsystem" + + + 2.0.10 + 1.1.1 + 1.0.0 + 1.0.0 + 6.0.0 + 5.0.0 + 1.1.0.v20120522-1841 + 1.2.101.v20150831-1342 + 3.0 + 2.5.0 org.apache.aries.subsystem org.apache.aries.subsystem.api - 2.0.10 + ${org.apache.aries.subsystem.api.version} org.apache.aries org.apache.aries.util - 1.1.1 + ${org.apache.aries.util.version} org.apache.aries.application org.apache.aries.application.api - 1.0.0 + ${org.apache.aries.application.api.version} org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.osgi org.osgi.core - 6.0.0 + ${org.osgi.core.version} provided org.osgi org.osgi.enterprise - 5.0.0 + ${org.osgi.enterprise.version} provided org.eclipse.equinox org.eclipse.equinox.coordinator - 1.1.0.v20120522-1841 + ${org.eclipse.equinox.coordinator.version} org.eclipse.equinox org.eclipse.equinox.region - 1.2.101.v20150831-1342 + ${org.eclipse.equinox.region.version} org.easymock easymock - 3.0 + ${easymock.version} test @@ -150,7 +162,7 @@ org.apache.felix maven-bundle-plugin - 2.5.0 + ${maven-bundle-plugin.version} true true diff --git a/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml b/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml index 3effed3903..c4df6bb67f 100644 --- a/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml +++ b/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml @@ -17,14 +17,14 @@ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.aries parent 1.0.1-SNAPSHOT ../../../parent/pom.xml - + org.apache.aries.subsystem org.apache.aries.subsystem.example.helloIsolation diff --git a/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml b/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml index 5135cce54a..77dd9e9e7f 100644 --- a/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml +++ b/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml @@ -17,14 +17,14 @@ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.aries parent 1.0.1-SNAPSHOT ../../../parent/pom.xml - + org.apache.aries.subsystem org.apache.aries.subsystem.example.helloIsolationRef diff --git a/subsystem/subsystem-executor/pom.xml b/subsystem/subsystem-executor/pom.xml index e99e95abf8..3c1820728a 100644 --- a/subsystem/subsystem-executor/pom.xml +++ b/subsystem/subsystem-executor/pom.xml @@ -17,7 +17,7 @@ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.aries @@ -32,7 +32,7 @@ Apache Aries Subsystem Executor 0.1-SNAPSHOT - 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. diff --git a/subsystem/subsystem-gogo-command/pom.xml b/subsystem/subsystem-gogo-command/pom.xml index 6f0ff6c8a4..ac448a05a4 100644 --- a/subsystem/subsystem-gogo-command/pom.xml +++ b/subsystem/subsystem-gogo-command/pom.xml @@ -18,52 +18,55 @@ under the License. --> - 4.0.0 - - org.apache.aries - parent - 2.0.0 - ../../parent/pom.xml - + 4.0.0 + + org.apache.aries + parent + 2.0.0 + ../../parent/pom.xml + - org.apache.aries.subsystem - org.apache.aries.subsystem.gogo-command - 1.0.1-SNAPSHOT - Apache Aries Subsystem Gogo command - bundle + org.apache.aries.subsystem + org.apache.aries.subsystem.gogo-command + 1.0.1-SNAPSHOT + Apache Aries Subsystem Gogo command + bundle - - scm:git:https://gitbox.apache.org/repos/asf/aries.git - scm:git:https://gitbox.apache.org/repos/asf/aries.git - https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + scm:git:https://gitbox.apache.org/repos/asf/aries.git + scm:git:https://gitbox.apache.org/repos/asf/aries.git + https://gitbox.apache.org/repos/asf?p=aries.git;a=summary + - - - org.apache.aries.subsystem.gogo.Activator - - - - * - - - org.apache.aries.subsystem.gogo.* - - 1.0.0 - + + + org.apache.aries.subsystem.gogo.Activator + + + + * + + + org.apache.aries.subsystem.gogo.* + + 1.0.0 - - - org.osgi - org.osgi.core - 5.0.0 - provided - - - org.osgi - org.osgi.enterprise - 5.0.0 - provided - - + 5.0.0 + 5.0.0 + + + + + org.osgi + org.osgi.core + ${org.osgi.core.version} + provided + + + org.osgi + org.osgi.enterprise + ${org.osgi.enterprise.version} + provided + + diff --git a/subsystem/subsystem-install/pom.xml b/subsystem/subsystem-install/pom.xml index 652242eecf..b6b34a199a 100644 --- a/subsystem/subsystem-install/pom.xml +++ b/subsystem/subsystem-install/pom.xml @@ -17,7 +17,7 @@ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.aries @@ -43,13 +43,16 @@ org.apache.aries.subsystem.install.internal + + 1.2.0-SNAPSHOT + 2.0.8 org.apache.aries.subsystem org.apache.aries.subsystem.api - 1.2.0-SNAPSHOT + ${org.apache.aries.subsystem.api.version} org.osgi @@ -59,7 +62,7 @@ org.apache.felix org.apache.felix.fileinstall - 2.0.8 + ${org.apache.felix.fileinstall.version} diff --git a/subsystem/subsystem-itests-api-bundle/pom.xml b/subsystem/subsystem-itests-api-bundle/pom.xml index 59e1bec116..b2475870a2 100644 --- a/subsystem/subsystem-itests-api-bundle/pom.xml +++ b/subsystem/subsystem-itests-api-bundle/pom.xml @@ -44,7 +44,7 @@ true - + diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml index 954df6963a..df87acfe2e 100644 --- a/subsystem/subsystem-itests/pom.xml +++ b/subsystem/subsystem-itests/pom.xml @@ -38,28 +38,53 @@ + 5.0.3 + 1.5 + 3.0 3.4.0 - 2.5.3 1.5.16 + 2.3 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.1 + 2.0.11-SNAPSHOT + 2.0.11-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.5-SNAPSHOT + 2.0.0-SNAPSHOT + 1.1.0 + 1.6.6 + 1.8.0 + 1.2.200.v20120522-2049 + 3.10.0.v20140606-1445 + 1.0.2 + 6.0.0 + 6.0.0 + 6.0.0 + 1.7.7 + 2.0.0 + 2.5.3 org.osgi osgi.core - 6.0.0 + ${osgi.core.version} test org.osgi osgi.cmpn - 6.0.0 + ${osgi.cmpn.version} test org.osgi osgi.enterprise - 6.0.0 + ${osgi.enterprise.version} test @@ -71,7 +96,7 @@ org.apache.aries org.apache.aries.util test - 1.1.0 + ${org.apache.aries.util.version} org.osgi @@ -83,7 +108,7 @@ org.apache.aries.application org.apache.aries.application.api test - 1.0.0 + ${org.apache.aries.application.api.version} org.osgi @@ -94,7 +119,7 @@ org.apache.aries.application org.apache.aries.application.modeller - 1.0.0 + ${org.apache.aries.application.modeller.version} org.osgi @@ -106,7 +131,7 @@ org.apache.aries.application org.apache.aries.application.utils test - 1.0.0 + ${org.apache.aries.application.utils.version} org.osgi @@ -117,20 +142,20 @@ org.apache.aries.blueprint org.apache.aries.blueprint - 1.0.0 + ${org.apache.aries.blueprint.version} test org.apache.aries.proxy org.apache.aries.proxy - 1.0.1 + ${org.apache.aries.proxy.version} test org.apache.aries.subsystem org.apache.aries.subsystem.api test - 2.0.11-SNAPSHOT + ${org.apache.aries.subsystem.api.version} org.osgi @@ -142,7 +167,7 @@ org.apache.aries.subsystem org.apache.aries.subsystem.core test - 2.0.11-SNAPSHOT + ${org.apache.aries.subsystem.core.version} org.osgi @@ -154,7 +179,7 @@ org.apache.aries.subsystem org.apache.aries.subsystem.obr test - 1.0.5-SNAPSHOT + ${org.apache.aries.subsystem.obr.version} org.osgi @@ -165,20 +190,20 @@ org.apache.aries.subsystem org.apache.aries.subsystem.itest.interfaces - 1.0.0-SNAPSHOT + ${org.apache.aries.subsystem.itest.interfaces.version} test org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} org.apache.felix org.apache.felix.bundlerepository test - 1.6.6 + ${org.apache.felix.bundlerepository.version} org.osgi @@ -194,7 +219,7 @@ org.apache.felix org.apache.felix.configadmin test - 1.8.0 + ${org.apache.felix.configadmin.version} org.osgi @@ -214,7 +239,7 @@ org.apache.felix org.osgi.service.obr test - 1.0.2 + ${org.osgi.service.obr.version} org.osgi @@ -233,20 +258,20 @@ org.easymock easymock - 3.0 + ${easymock.version} test org.eclipse.equinox org.eclipse.equinox.event test - 1.2.200.v20120522-2049 + ${org.eclipse.equinox.event.version} org.ow2.asm asm-all - 5.0.3 + ${asm.version} test @@ -254,7 +279,7 @@ org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -301,7 +326,7 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} org.osgi.core @@ -312,7 +337,7 @@ org.eclipse.tycho org.eclipse.osgi - 3.10.0.v20140606-1445 + ${org.eclipse.osgi.version} org.ops4j.pax.logging @@ -331,9 +356,9 @@ org.apache.maven.plugins maven-jar-plugin - 2.3 + ${maven-jar-plugin.version} - + tb1-nobsn jar @@ -653,7 +678,7 @@ process-test-classes - + aries1523fragment @@ -678,7 +703,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.5 + ${build-helper-maven-plugin.version} add-source-tb1 @@ -809,7 +834,7 @@ - + add-source-aries1523fragment generate-sources diff --git a/subsystem/subsystem-obr/pom.xml b/subsystem/subsystem-obr/pom.xml index a3d6f25051..9dbde6e5a4 100644 --- a/subsystem/subsystem-obr/pom.xml +++ b/subsystem/subsystem-obr/pom.xml @@ -52,6 +52,11 @@ org.apache.aries.subsystem.obr.internal 1.0.0 + + 1.0.0 + 1.6.4 + 5.0.0 + 5.0.0 @@ -63,22 +68,22 @@ org.apache.aries.application org.apache.aries.application.utils - 1.0.0 + ${org.apache.aries.application.utils.version} org.apache.felix org.apache.felix.bundlerepository - 1.6.4 + ${org.apache.felix.bundlerepository.version} org.osgi org.osgi.core - 5.0.0 + ${org.osgi.core.version} org.osgi org.osgi.enterprise - 5.0.0 + ${org.osgi.enterprise.version} org.slf4j diff --git a/subsystem/subsystem-scope-api/pom.xml b/subsystem/subsystem-scope-api/pom.xml index 0b20b0d226..a95b0c2d0e 100644 --- a/subsystem/subsystem-scope-api/pom.xml +++ b/subsystem/subsystem-scope-api/pom.xml @@ -1,22 +1,21 @@ + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions + and limitations under the License. +--> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.aries @@ -42,10 +41,10 @@ org.apache.aries.subsystem.scope.* - - * - - true + + * + + true diff --git a/subsystem/subsystem-scope-impl/pom.xml b/subsystem/subsystem-scope-impl/pom.xml index 0c72301bc9..13c654f0cd 100644 --- a/subsystem/subsystem-scope-impl/pom.xml +++ b/subsystem/subsystem-scope-impl/pom.xml @@ -1,22 +1,21 @@ + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions + and limitations under the License. +--> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.aries @@ -47,63 +46,71 @@ org.apache.aries.subsystem.scope.impl true + + 0.3 + 0.3 + 0.1-SNAPSHOT + 0.1-SNAPSHOT + 0.3 + 1.6.4 + 1.1.0 org.apache.aries.subsystem org.apache.aries.subsystem.api - 0.1-SNAPSHOT + ${org.apache.aries.subsystem.api.version} - - org.osgi - org.osgi.core - + + org.osgi + org.osgi.core + org.apache.aries.subsystem org.apache.aries.subsystem.scope.api - 0.1-SNAPSHOT + ${org.apache.aries.subsystem.scope.api.version} - - org.osgi - org.osgi.core - + + org.osgi + org.osgi.core + org.apache.aries.application org.apache.aries.application.api - 0.3 + ${org.apache.aries.application.api.version} - - org.osgi - org.osgi.core - + + org.osgi + org.osgi.core + org.apache.aries.application org.apache.aries.application.utils - 0.3 + ${org.apache.aries.application.utils.version} - - org.osgi - org.osgi.core - + + org.osgi + org.osgi.core + org.apache.aries.testsupport org.apache.aries.testsupport.unit - 0.3 + ${org.apache.aries.testsupport.unit.version} test - - org.osgi - org.osgi.core - + + org.osgi + org.osgi.core + @@ -114,12 +121,12 @@ org.apache.felix org.apache.felix.utils - 1.1.0 + ${org.apache.felix.utils.version} - - org.osgi - org.osgi.core - + + org.osgi + org.osgi.core + @@ -135,12 +142,12 @@ org.apache.felix org.apache.felix.bundlerepository - 1.6.4 + ${org.apache.felix.bundlerepository.version} - - org.osgi - org.osgi.core - + + org.osgi + org.osgi.core + diff --git a/subsystem/subsystem-scope-itests/pom.xml b/subsystem/subsystem-scope-itests/pom.xml index accfb05893..433298bfdb 100644 --- a/subsystem/subsystem-scope-itests/pom.xml +++ b/subsystem/subsystem-scope-itests/pom.xml @@ -1,22 +1,21 @@ + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions + and limitations under the License. +--> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.aries @@ -33,96 +32,114 @@ Integration tests using the subsystem scope api, impl for the implementation and subsystem-example helloIsolation and helloIsolationRef for the subsysem to be tested. - + + 1.5 + 1.2 3.4.0 + 0.9.29 + 2.3 + 0.3 + 1.0.0 + 0.1-SNAPSHOT + 0.1-SNAPSHOT + 0.1-SNAPSHOT + 2.0.0-SNAPSHOT + 1.1.0 + 1.6.4 + 1.2.8 + 1.1.0.v20120522-1841 + 3.9.1.v20130814-1242 + 1.0.2 + 1.7.7 + 2.0.0 1.6.0 - + org.apache.aries.subsystem org.apache.aries.subsystem.api test - 1.0.0 + ${org.apache.aries.subsystem.api.version} org.apache.aries.subsystem org.apache.aries.subsystem.scope.api test - 0.1-SNAPSHOT + ${org.apache.aries.subsystem.scope.api.version} org.apache.aries.subsystem org.apache.aries.subsystem.scope.impl test - 0.1-SNAPSHOT + ${org.apache.aries.subsystem.scope.impl.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} org.apache.aries org.apache.aries.util test - 1.1.0 + ${org.apache.aries.util.version} org.apache.felix org.apache.felix.configadmin test - 1.2.8 + ${org.apache.felix.configadmin.version} org.apache.felix org.osgi.service.obr test - 1.0.2 + ${org.osgi.service.obr.version} - - org.osgi.core - org.apache.felix - + + org.osgi.core + org.apache.felix + org.apache.felix org.apache.felix.bundlerepository test - 1.6.4 + ${org.apache.felix.bundlerepository.version} - - org.osgi.core - org.osgi - + + org.osgi.core + org.osgi + org.apache.aries.application org.apache.aries.application.utils test - 0.3 + ${org.apache.aries.application.utils.version} org.apache.aries.subsystem org.apache.aries.subsystem.example.helloIsolation - 0.1-SNAPSHOT + ${org.apache.aries.subsystem.example.helloIsolation.version} test - - org.eclipse.equinox - org.eclipse.equinox.coordinator - 1.1.0.v20120522-1841 - - + + org.eclipse.equinox + org.eclipse.equinox.coordinator + ${org.eclipse.equinox.coordinator.version} + + org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -157,19 +174,19 @@ ch.qos.logback logback-core - 0.9.29 + ${logback.version} test ch.qos.logback logback-classic - 0.9.29 + ${logback.version} test org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} org.osgi.core @@ -180,7 +197,7 @@ org.eclipse.tycho org.eclipse.osgi - 3.9.1.v20130814-1242 + ${org.eclipse.osgi.version} org.ops4j.pax.logging @@ -196,248 +213,248 @@ - - org.apache.maven.plugins - maven-jar-plugin - 2.3 - - - tb1 - - jar - - - 1 - - src/test/bundles/tb1/META-INF/MANIFEST.MF - - ${project.build.directory}/test-classes - - org/apache/aries/subsystem/scope/itests/tb1/* - **/META-INF/* - - ${project.build.directory}/test-classes - tb - - process-test-classes - - - tb2 - - jar - - - 2 - - src/test/bundles/tb2/META-INF/MANIFEST.MF - - ${project.build.directory}/test-classes - - org/apache/aries/subsystem/scope/itests/tb2/* - **/META-INF/* - - ${project.build.directory}/test-classes - tb - - process-test-classes - - - tb3 - - jar - - - 3 - - src/test/bundles/tb3/META-INF/MANIFEST.MF - - ${project.build.directory}/test-classes - - org/apache/aries/subsystem/scope/itests/tb3/* - **/META-INF/* - - ${project.build.directory}/test-classes - tb - - process-test-classes - - - tb4 - - jar - - - 4 - - src/test/bundles/tb4/META-INF/MANIFEST.MF - - ${project.build.directory}/test-classes - - org/apache/aries/subsystem/scope/itests/tb4/* - **/META-INF/* - - ${project.build.directory}/test-classes - tb - - process-test-classes - - - tb5 - - jar - - - 5 - - src/test/bundles/tb5/META-INF/MANIFEST.MF - - ${project.build.directory}/test-classes - - org/apache/aries/subsystem/scope/itests/tb5/* - **/META-INF/* - - ${project.build.directory}/test-classes - tb - - process-test-classes - - - tb6 - - jar - - - 6 - - src/test/bundles/tb6/META-INF/MANIFEST.MF - - ${project.build.directory}/test-classes - - org/apache/aries/subsystem/scope/itests/tb6/* - **/META-INF/* - - ${project.build.directory}/test-classes - tb - - process-test-classes - - - tb7 - - jar - - - 7 - - src/test/bundles/tb7/META-INF/MANIFEST.MF - - ${project.build.directory}/test-classes - - org/apache/aries/subsystem/scope/itests/tb7/* - **/META-INF/* - - ${project.build.directory}/test-classes - tb - - process-test-classes - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.5 - - - add-source-tb1 - generate-sources - - add-test-source - - - - src/test/bundles/tb1 - - - - - add-source-tb2 - generate-sources - - add-test-source - - - - src/test/bundles/tb2 - - - - - add-source-tb3 - generate-sources - - add-test-source - - - - src/test/bundles/tb3 - - - - - add-source-tb4 - generate-sources - - add-test-source - - - - src/test/bundles/tb4 - - - - - add-source-tb5 - generate-sources - - add-test-source - - - - src/test/bundles/tb5 - - - - - add-source-tb6 - generate-sources - - add-test-source - - - - src/test/bundles/tb6 - - - - - add-source-tb7 - generate-sources - - add-test-source - - - - src/test/bundles/tb7 - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + tb1 + + jar + + + 1 + + src/test/bundles/tb1/META-INF/MANIFEST.MF + + ${project.build.directory}/test-classes + + org/apache/aries/subsystem/scope/itests/tb1/* + **/META-INF/* + + ${project.build.directory}/test-classes + tb + + process-test-classes + + + tb2 + + jar + + + 2 + + src/test/bundles/tb2/META-INF/MANIFEST.MF + + ${project.build.directory}/test-classes + + org/apache/aries/subsystem/scope/itests/tb2/* + **/META-INF/* + + ${project.build.directory}/test-classes + tb + + process-test-classes + + + tb3 + + jar + + + 3 + + src/test/bundles/tb3/META-INF/MANIFEST.MF + + ${project.build.directory}/test-classes + + org/apache/aries/subsystem/scope/itests/tb3/* + **/META-INF/* + + ${project.build.directory}/test-classes + tb + + process-test-classes + + + tb4 + + jar + + + 4 + + src/test/bundles/tb4/META-INF/MANIFEST.MF + + ${project.build.directory}/test-classes + + org/apache/aries/subsystem/scope/itests/tb4/* + **/META-INF/* + + ${project.build.directory}/test-classes + tb + + process-test-classes + + + tb5 + + jar + + + 5 + + src/test/bundles/tb5/META-INF/MANIFEST.MF + + ${project.build.directory}/test-classes + + org/apache/aries/subsystem/scope/itests/tb5/* + **/META-INF/* + + ${project.build.directory}/test-classes + tb + + process-test-classes + + + tb6 + + jar + + + 6 + + src/test/bundles/tb6/META-INF/MANIFEST.MF + + ${project.build.directory}/test-classes + + org/apache/aries/subsystem/scope/itests/tb6/* + **/META-INF/* + + ${project.build.directory}/test-classes + tb + + process-test-classes + + + tb7 + + jar + + + 7 + + src/test/bundles/tb7/META-INF/MANIFEST.MF + + ${project.build.directory}/test-classes + + org/apache/aries/subsystem/scope/itests/tb7/* + **/META-INF/* + + ${project.build.directory}/test-classes + tb + + process-test-classes + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + add-source-tb1 + generate-sources + + add-test-source + + + + src/test/bundles/tb1 + + + + + add-source-tb2 + generate-sources + + add-test-source + + + + src/test/bundles/tb2 + + + + + add-source-tb3 + generate-sources + + add-test-source + + + + src/test/bundles/tb3 + + + + + add-source-tb4 + generate-sources + + add-test-source + + + + src/test/bundles/tb4 + + + + + add-source-tb5 + generate-sources + + add-test-source + + + + src/test/bundles/tb5 + + + + + add-source-tb6 + generate-sources + + add-test-source + + + + src/test/bundles/tb6 + + + + + add-source-tb7 + generate-sources + + add-test-source + + + + src/test/bundles/tb7 + + + + + + org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file diff --git a/testsupport/testsupport-unit/pom.xml b/testsupport/testsupport-unit/pom.xml index adbdb702a6..7d325c4d07 100644 --- a/testsupport/testsupport-unit/pom.xml +++ b/testsupport/testsupport-unit/pom.xml @@ -59,6 +59,8 @@ org.ops4j.pax.exam.container.def*;resolution:=optional, * + + 1 @@ -84,7 +86,7 @@ javax.inject javax.inject - 1 + ${javax.inject.version} diff --git a/transaction/transaction-blueprint/pom.xml b/transaction/transaction-blueprint/pom.xml index 118adc3af7..10b3c17397 100644 --- a/transaction/transaction-blueprint/pom.xml +++ b/transaction/transaction-blueprint/pom.xml @@ -38,8 +38,8 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - HEAD - + HEAD + @@ -50,6 +50,12 @@ org.apache.aries.transaction.parsing 1.1.0 + + 3.3.1 + 1.2 + 2.5.3 + 1.0.0 + 1.1.3 @@ -57,7 +63,7 @@ org.apache.aries org.apache.aries.util - 1.1.3 + ${org.apache.aries.util.version} @@ -76,7 +82,7 @@ org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.0.0 + ${org.apache.aries.blueprint.core.version} provided @@ -87,7 +93,7 @@ javax.transaction javax.transaction-api - 1.2 + ${javax.transaction-api.version} provided @@ -104,7 +110,7 @@ org.easymock easymock - 3.3.1 + ${easymock.version} test @@ -126,7 +132,7 @@ org.apache.felix maven-bundle-plugin - 2.5.3 + ${maven-bundle-plugin.version} true true diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index 11c6e3120d..8b7345b8c6 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -40,7 +40,32 @@ + 5.0.3 + 1.2 + 1.2 3.4.0 + 3.1.1 + 1.0 + 1.1 + 3.0.0 + 1.2 + 1.2 + 1.0.0 + 1.4.4 + 1.0.3 + 2.3.2-SNAPSHOT + 2.1.4-SNAPSHOT + 1.3.4-SNAPSHOT + 1.0.1-SNAPSHOT + 1.0.1-SNAPSHOT + 1.1.3 + 1.8.4 + 1.0.0 + 1_2 + 3.8.0.v20120529-1548 + 4.3.1 + 1.7.7 + 2.0.0 2.6.7 @@ -49,7 +74,7 @@ org.apache.aries org.apache.aries.util - 1.1.3 + ${org.apache.aries.util.version} @@ -58,122 +83,122 @@ org.osgi org.osgi.core - 4.3.1 + ${org.osgi.core.version} org.apache.aries.proxy org.apache.aries.proxy.impl test - 1.0.3 + ${org.apache.aries.proxy.impl.version} org.apache.felix org.apache.felix.coordinator - 1.0.0 + ${org.apache.felix.coordinator.version} test org.apache.felix org.apache.felix.configadmin - 1.8.4 + ${org.apache.felix.configadmin.version} test org.apache.aries.blueprint org.apache.aries.blueprint.api - 1.0.0 + ${org.apache.aries.blueprint.api.version} test org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.4.4 + ${org.apache.aries.blueprint.core.version} test org.apache.geronimo.specs geronimo-j2ee-connector_1.6_spec - 1.0 + ${geronimo-j2ee-connector_1.6_spec.version} org.apache.geronimo.specs geronimo-validation_1.0_spec - 1.1 + ${geronimo-validation_1.0_spec.version} org.apache.geronimo.components geronimo-connector - 3.1.1 + ${geronimo-connector.version} javax.transaction javax.transaction-api - 1.2 + ${javax.transaction-api.version} javax.interceptor javax.interceptor-api - 1.2 + ${javax.interceptor-api.version} org.apache.servicemix.bundles org.apache.servicemix.bundles.javax-inject - 1_2 + ${org.apache.servicemix.bundles.javax-inject.version} javax.el javax.el-api - 3.0.0 + ${javax.el-api.version} javax.enterprise cdi-api - 1.2 + ${cdi-api.version} org.apache.aries.transaction org.apache.aries.transaction.manager test - 1.3.4-SNAPSHOT + ${org.apache.aries.transaction.manager.version} org.apache.aries.transaction org.apache.aries.transaction.blueprint test - 2.3.2-SNAPSHOT + ${org.apache.aries.transaction.blueprint.version} org.apache.aries.transaction org.apache.aries.transaction.jdbc test - 2.1.4-SNAPSHOT + ${org.apache.aries.transaction.jdbc.version} org.apache.aries.transaction org.apache.aries.transaction.testds test - 1.0.1-SNAPSHOT + ${org.apache.aries.transaction.testds.version} org.apache.aries.transaction org.apache.aries.transaction.testbundle test - 1.0.1-SNAPSHOT + ${org.apache.aries.transaction.testbundle.version} org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} org.ow2.asm asm-all test - 5.0.3 + ${asm.version} org.ops4j.pax.logging @@ -190,7 +215,7 @@ org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -225,7 +250,7 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} junit @@ -239,7 +264,7 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-depends-file diff --git a/transaction/transaction-jdbc/pom.xml b/transaction/transaction-jdbc/pom.xml index 79a5f16d50..552feb834a 100644 --- a/transaction/transaction-jdbc/pom.xml +++ b/transaction/transaction-jdbc/pom.xml @@ -67,6 +67,17 @@ 1.0.0 -Xdoclint:none + + 1.7 + 3.1.1 + 1.7 + 2.5.3 + 3.18 + 1.0.0 + 1.1.1 + 1.1.3 + 1.8 + 3.7 @@ -74,7 +85,7 @@ org.apache.aries org.apache.aries.util - 1.1.3 + ${org.apache.aries.util.version} @@ -83,7 +94,7 @@ org.apache.aries.transaction org.apache.aries.transaction.manager - 1.1.1 + ${org.apache.aries.transaction.manager.version} org.apache.aries @@ -107,25 +118,25 @@ org.tranql tranql-connector - 1.8 + ${tranql-connector.version} provided org.apache.geronimo.components geronimo-connector - 3.1.1 + ${geronimo-connector.version} provided org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.0.0 + ${org.apache.aries.blueprint.core.version} true org.apache.xbean xbean-blueprint - 3.7 + ${xbean-blueprint.version} true @@ -136,7 +147,7 @@ org.codehaus.mojo animal-sniffer-annotations - 1.7 + ${animal-sniffer-annotations.version} true @@ -146,7 +157,7 @@ org.apache.xbean maven-xbean-plugin - 3.18 + ${maven-xbean-plugin.version} @@ -160,7 +171,7 @@ maven-antrun-plugin - 1.7 + ${maven-antrun-plugin.version} concat @@ -171,10 +182,10 @@ - + - + @@ -197,7 +208,7 @@ org.apache.felix maven-bundle-plugin - 2.5.3 + ${maven-bundle-plugin.version} true true diff --git a/transaction/transaction-jms/pom.xml b/transaction/transaction-jms/pom.xml index 226c57366e..831af214de 100644 --- a/transaction/transaction-jms/pom.xml +++ b/transaction/transaction-jms/pom.xml @@ -61,6 +61,16 @@ org.apache.aries.transaction.jms.internal.Activator 1.0.0 + + 1.6 + 1.1.1 + 1.1.1 + 3.1.4 + 2.5.3 + 3.18 + 1.0.0 + 1.1.3 + 3.7 @@ -68,7 +78,7 @@ org.apache.aries org.apache.aries.util - 1.1.3 + ${org.apache.aries.util.version} @@ -82,17 +92,17 @@ org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1.1 + ${geronimo-jta_1.1_spec.version} org.apache.geronimo.specs geronimo-jms_1.1_spec - 1.1.1 + ${geronimo-jms_1.1_spec.version} commons-pool commons-pool - 1.6 + ${commons-pool.version} org.slf4j @@ -101,13 +111,13 @@ org.apache.aries.blueprint org.apache.aries.blueprint.core - 1.0.0 + ${org.apache.aries.blueprint.core.version} true org.apache.xbean xbean-blueprint - 3.7 + ${xbean-blueprint.version} true @@ -118,7 +128,7 @@ org.apache.geronimo.components geronimo-transaction - 3.1.4 + ${geronimo-transaction.version} provided @@ -128,7 +138,7 @@ org.apache.xbean maven-xbean-plugin - 3.18 + ${maven-xbean-plugin.version} @@ -156,7 +166,7 @@ org.apache.felix maven-bundle-plugin - 2.5.3 + ${maven-bundle-plugin.version} true true diff --git a/transaction/transaction-manager/pom.xml b/transaction/transaction-manager/pom.xml index f95c92125f..b86b0d12af 100644 --- a/transaction/transaction-manager/pom.xml +++ b/transaction/transaction-manager/pom.xml @@ -69,6 +69,14 @@ 1.3.0 false false + + 2.14.0 + 3.1.4 + 1.0.1-1 + 4.13.1 + 2.5.3 + 1.1 + 2.5.6 @@ -85,20 +93,20 @@ org.apache.geronimo.components geronimo-transaction - 3.1.4 + ${geronimo-transaction.version} provided org.objectweb.howl howl - 1.0.1-1 + ${howl.version} provided org.springframework spring-tx true - 2.5.6 + ${spring-tx.version} org.slf4j @@ -108,7 +116,7 @@ junit junit - 4.13.1 + ${junit.version} test @@ -119,7 +127,7 @@ commons-io commons-io - 2.14.0 + ${commons-io.version} test @@ -162,7 +170,7 @@ - + @@ -206,7 +214,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.1 + ${maven-shade-plugin.version} package @@ -258,7 +266,7 @@ org.apache.felix maven-bundle-plugin - 2.5.3 + ${maven-bundle-plugin.version} true true diff --git a/transaction/transaction-testbundle/pom.xml b/transaction/transaction-testbundle/pom.xml index 22455ed9c9..e339a5ad56 100644 --- a/transaction/transaction-testbundle/pom.xml +++ b/transaction/transaction-testbundle/pom.xml @@ -49,6 +49,9 @@ org.apache.aries.transaction.test.impl + + 1.2 + 1.0.2 @@ -56,12 +59,12 @@ org.apache.aries.transaction org.apache.aries.transaction.blueprint provided - 1.0.2 + ${org.apache.aries.transaction.blueprint.version} javax.transaction javax.transaction-api - 1.2 + ${javax.transaction-api.version} provided diff --git a/transaction/transaction-testds/pom.xml b/transaction/transaction-testds/pom.xml index e87a763076..e62999f2ae 100644 --- a/transaction/transaction-testds/pom.xml +++ b/transaction/transaction-testds/pom.xml @@ -43,13 +43,15 @@ ${project.artifactId}* + + 10.14.2.0 org.apache.derby derby - 10.14.2.0 + ${derby.version} diff --git a/util/pom.xml b/util/pom.xml index 89afbd4f8a..92fd199634 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -64,6 +64,10 @@ org.apache.aries.util.tracker.hook 1.1.0 + + 2.8.1 + 1.0.0 + 3.5.0.v20090520 @@ -80,13 +84,13 @@ org.eclipse osgi - 3.5.0.v20090520 + ${osgi.version} provided org.apache.aries.testsupport org.apache.aries.testsupport.unit - 1.0.0 + ${org.apache.aries.testsupport.unit.version} test @@ -100,7 +104,7 @@ maven-javadoc-plugin - 2.8.1 + ${maven-javadoc-plugin.version} javadoc-jar diff --git a/versioning/versioning-checker/pom.xml b/versioning/versioning-checker/pom.xml index 1a819501db..60fbec0649 100644 --- a/versioning/versioning-checker/pom.xml +++ b/versioning/versioning-checker/pom.xml @@ -25,7 +25,7 @@ org.apache.aries parent 2.1.1 - + org.apache.aries.versioning @@ -59,20 +59,25 @@ 0.2.0 true + + 9.6 + 2.5.2 + 1.0.0 + 1.1.0 - + org.apache.aries org.apache.aries.util - 1.1.0 + ${org.apache.aries.util.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 1.0.0 + ${org.apache.aries.testsupport.unit.version} @@ -85,13 +90,13 @@ org.ow2.asm asm true - 9.6 + ${asm.version} org.ow2.asm asm-commons true - 9.6 + ${asm.version} org.osgi @@ -114,7 +119,7 @@ maven-release-plugin - 2.5.2 + ${maven-release-plugin.version} diff --git a/versioning/versioning-plugin/pom.xml b/versioning/versioning-plugin/pom.xml index 22ead0d116..cf707cd552 100644 --- a/versioning/versioning-plugin/pom.xml +++ b/versioning/versioning-plugin/pom.xml @@ -25,7 +25,7 @@ org.apache.aries parent 2.1.1 - + org.apache.aries.versioning @@ -39,12 +39,25 @@ scm:git:https://gitbox.apache.org/repos/asf/aries.git https://gitbox.apache.org/repos/asf?p=aries.git;a=summary - + + + 1.0 + 3.0.3 + 1.4 + 3.0.3 + 3.0.3 + 3.2 + 3.0.3 + 3.3 + 2.5.2 + 0.3.2-SNAPSHOT + + org.apache.aries.versioning org.apache.aries.versioning.checker - 0.3.2-SNAPSHOT + ${org.apache.aries.versioning.checker.version} org.osgi @@ -61,22 +74,22 @@ org.apache.maven maven-plugin-api - 3.0.3 + ${maven-plugin-api.version} org.apache.maven maven-artifact - 3.0.3 + ${maven-artifact.version} org.apache.maven maven-core - 3.0.3 + ${maven-core.version} org.apache.maven maven-compat - 3.0.3 + ${maven-compat.version} junit @@ -87,19 +100,19 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.2 + ${maven-plugin-annotations.version} provided org.apache.maven.shared maven-artifact-resolver - 1.0 + ${maven-artifact-resolver.version} org.apache.maven.shared maven-common-artifact-filters - 1.4 + ${maven-common-artifact-filters.version} @@ -107,7 +120,7 @@ maven-plugin-plugin - 3.3 + ${maven-plugin-plugin.version} asv true @@ -123,7 +136,7 @@ maven-release-plugin - 2.5.2 + ${maven-release-plugin.version} diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml index 897319c442..d6b515a5c9 100644 --- a/web/web-itests/pom.xml +++ b/web/web-itests/pom.xml @@ -41,22 +41,34 @@ + 5.0.3 + 1.2 3.4.0 - 2.5.3 1.5.16 + 1.0.0 + 1.0.0 + 1.0.1 + 2.0.0-SNAPSHOT + 1.0.0 + 1.0.1-SNAPSHOT + 1.2.4 + 3.8.0.v20120529-1548 + 1.7.7 + 2.0.0 + 2.5.3 org.ow2.asm asm-debug-all - 5.0.3 + ${asm.version} org.apache.aries.testsupport org.apache.aries.testsupport.unit test - 2.0.0-SNAPSHOT + ${org.apache.aries.testsupport.unit.version} org.osgi @@ -67,12 +79,12 @@ org.apache.aries.blueprint org.apache.aries.blueprint.sample test - 1.0.0 + ${org.apache.aries.blueprint.sample.version} org.apache.felix org.apache.felix.configadmin - 1.2.4 + ${org.apache.felix.configadmin.version} org.apache.felix @@ -89,26 +101,26 @@ org.apache.aries org.apache.aries.util test - 1.0.0 + ${org.apache.aries.util.version} org.apache.aries.proxy org.apache.aries.proxy test - 1.0.1 + ${org.apache.aries.proxy.version} org.apache.aries.blueprint org.apache.aries.blueprint test - 1.0.0 + ${org.apache.aries.blueprint.version} org.slf4j slf4j-api - 1.7.7 + ${slf4j-api.version} org.ops4j.pax.exam @@ -155,7 +167,7 @@ org.ops4j.pax.tinybundles tinybundles - 2.0.0 + ${tinybundles.version} org.osgi.core @@ -171,14 +183,14 @@ org.eclipse org.eclipse.osgi - 3.8.0.v20120529-1548 + ${org.eclipse.osgi.version} org.apache.aries.web org.apache.aries.web.urlhandler provided - 1.0.1-SNAPSHOT + ${org.apache.aries.web.urlhandler.version} @@ -187,7 +199,7 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.2 + ${depends-maven-plugin.version} generate-resources diff --git a/web/web-urlhandler/pom.xml b/web/web-urlhandler/pom.xml index da572a14c5..4ab70b9f5a 100644 --- a/web/web-urlhandler/pom.xml +++ b/web/web-urlhandler/pom.xml @@ -51,6 +51,8 @@ org.apache.aries.web.converter.impl.Activator 1.0.0 + + 5.0.3 @@ -67,7 +69,7 @@ org.ow2.asm asm-debug-all - 5.0.3 + ${asm.version}