Replace ${pom.*} by ${project.*}
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@939971 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/bundleAsiPOJO/tests/pom.xml b/ipojo/tests/bundleAsiPOJO/tests/pom.xml
index b55dd13..2dab748 100644
--- a/ipojo/tests/bundleAsiPOJO/tests/pom.xml
+++ b/ipojo/tests/bundleAsiPOJO/tests/pom.xml
@@ -105,7 +105,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.tinybundles.bundleAsiPOJO
</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/ipojo/tests/composite/composite-runtime/pom.xml b/ipojo/tests/composite/composite-runtime/pom.xml
index 9cf023a..4c1b359 100644
--- a/ipojo/tests/composite/composite-runtime/pom.xml
+++ b/ipojo/tests/composite/composite-runtime/pom.xml
@@ -77,7 +77,7 @@
org.apache.felix.ipojo.test.composite.service, org.apache.felix.ipojo.test.composite.component, org.apache.felix.ipojo.test.composite.util
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.composite.*
diff --git a/ipojo/tests/composite/import-export/pom.xml b/ipojo/tests/composite/import-export/pom.xml
index 51846fe..499eac9 100644
--- a/ipojo/tests/composite/import-export/pom.xml
+++ b/ipojo/tests/composite/import-export/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.composite</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -79,7 +79,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.composite.exporter, org.apache.felix.ipojo.test.composite.importer
diff --git a/ipojo/tests/composite/service-instance/pom.xml b/ipojo/tests/composite/service-instance/pom.xml
index bd6acc6..68140e0 100644
--- a/ipojo/tests/composite/service-instance/pom.xml
+++ b/ipojo/tests/composite/service-instance/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.composite</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -79,7 +79,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.composite.instantiator*, org.apache.felix.ipojo.test.composite.instance, org.apache.felix.ipojo.test.instance
diff --git a/ipojo/tests/composite/service-providing/pom.xml b/ipojo/tests/composite/service-providing/pom.xml
index eebf766..d6ac4e9 100644
--- a/ipojo/tests/composite/service-providing/pom.xml
+++ b/ipojo/tests/composite/service-providing/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.composite</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -79,7 +79,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.composite.provides, org.apache.felix.ipojo.test.composite.test
diff --git a/ipojo/tests/core/annotations/pom.xml b/ipojo/tests/core/annotations/pom.xml
index 4e4501e..a7f69ff 100644
--- a/ipojo/tests/core/annotations/pom.xml
+++ b/ipojo/tests/core/annotations/pom.xml
@@ -99,7 +99,7 @@
org.apache.felix.ipojo.test.scenarios.annotations.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/bad-configurations/pom.xml b/ipojo/tests/core/bad-configurations/pom.xml
index 00d9273..248455c 100644
--- a/ipojo/tests/core/bad-configurations/pom.xml
+++ b/ipojo/tests/core/bad-configurations/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.bad.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/configadmin/pom.xml b/ipojo/tests/core/configadmin/pom.xml
index 1c0eb12..114a31a 100644
--- a/ipojo/tests/core/configadmin/pom.xml
+++ b/ipojo/tests/core/configadmin/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.configadmin.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/configuration/pom.xml b/ipojo/tests/core/configuration/pom.xml
index f916852..9e411fa 100644
--- a/ipojo/tests/core/configuration/pom.xml
+++ b/ipojo/tests/core/configuration/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.configuration.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/external-handlers/pom.xml b/ipojo/tests/core/external-handlers/pom.xml
index a1cf136..727f2f4 100644
--- a/ipojo/tests/core/external-handlers/pom.xml
+++ b/ipojo/tests/core/external-handlers/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.eh.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/factories/pom.xml b/ipojo/tests/core/factories/pom.xml
index e158755..d0926c1 100644
--- a/ipojo/tests/core/factories/pom.xml
+++ b/ipojo/tests/core/factories/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.factories.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/lifecycle-callback/pom.xml b/ipojo/tests/core/lifecycle-callback/pom.xml
index c96d996..99ff014 100644
--- a/ipojo/tests/core/lifecycle-callback/pom.xml
+++ b/ipojo/tests/core/lifecycle-callback/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.lifecycle.callback.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/lifecycle-controller/pom.xml b/ipojo/tests/core/lifecycle-controller/pom.xml
index 3ef699c..867ac13 100644
--- a/ipojo/tests/core/lifecycle-controller/pom.xml
+++ b/ipojo/tests/core/lifecycle-controller/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.lfc.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml b/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
index 9b0f4ca..6cf0a8c 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.core.service.dependency</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -73,7 +73,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.scenarios.service.dependency.dynamic.priority, org.apache.felix.ipojo.test.scenarios.service.dependency.policies, org.apache.felix.ipojo.test.scenarios.service.dependency.statics, org.apache.felix.ipojo.test.scenarios.util
diff --git a/ipojo/tests/core/service-dependency-comparator/pom.xml b/ipojo/tests/core/service-dependency-comparator/pom.xml
index 0529c5b..6f71513 100644
--- a/ipojo/tests/core/service-dependency-comparator/pom.xml
+++ b/ipojo/tests/core/service-dependency-comparator/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.core.service.dependency</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -73,7 +73,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.scenarios.service.dependency.comparator,
diff --git a/ipojo/tests/core/service-dependency-filter/pom.xml b/ipojo/tests/core/service-dependency-filter/pom.xml
index 7936d7e..3c1a5bc 100644
--- a/ipojo/tests/core/service-dependency-filter/pom.xml
+++ b/ipojo/tests/core/service-dependency-filter/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.core.service.dependency</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -73,7 +73,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.scenarios.service.dependency.filter, org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component, org.apache.felix.ipojo.test.scenarios.util
diff --git a/ipojo/tests/core/service-dependency/pom.xml b/ipojo/tests/core/service-dependency/pom.xml
index 609e2ec..f55135e 100644
--- a/ipojo/tests/core/service-dependency/pom.xml
+++ b/ipojo/tests/core/service-dependency/pom.xml
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test.scenarios.service.dependency.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/service-providing-strategies/pom.xml b/ipojo/tests/core/service-providing-strategies/pom.xml
index 6456700..0a7a366 100755
--- a/ipojo/tests/core/service-providing-strategies/pom.xml
+++ b/ipojo/tests/core/service-providing-strategies/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<artifactId>tests.core.ps</artifactId>
<groupId>ipojo.tests</groupId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -73,7 +73,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test.scenarios.component.strategies, org.apache.felix.ipojo.test.scenarios.ps.strategies
diff --git a/ipojo/tests/core/service-providing/pom.xml b/ipojo/tests/core/service-providing/pom.xml
index fb26d28..963d7e2 100644
--- a/ipojo/tests/core/service-providing/pom.xml
+++ b/ipojo/tests/core/service-providing/pom.xml
@@ -72,7 +72,7 @@
org.apache.felix.ipojo.test.scenarios.ps.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/handler/temporal/pom.xml b/ipojo/tests/handler/temporal/pom.xml
index 7dc3561..7e7cad8 100644
--- a/ipojo/tests/handler/temporal/pom.xml
+++ b/ipojo/tests/handler/temporal/pom.xml
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test.scenarios.temporal.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/handler/transaction/pom.xml b/ipojo/tests/handler/transaction/pom.xml
index 5345de8..8dadf3a 100644
--- a/ipojo/tests/handler/transaction/pom.xml
+++ b/ipojo/tests/handler/transaction/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.handler.transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/ipojo/tests/manipulator/creation/pom.xml b/ipojo/tests/manipulator/creation/pom.xml
index b69c6f4..027daaf 100644
--- a/ipojo/tests/manipulator/creation/pom.xml
+++ b/ipojo/tests/manipulator/creation/pom.xml
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test.scenarios.manipulation.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/manipulation/pom.xml b/ipojo/tests/manipulator/manipulation/pom.xml
index a6b2c8f..d48811c 100644
--- a/ipojo/tests/manipulator/manipulation/pom.xml
+++ b/ipojo/tests/manipulator/manipulation/pom.xml
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test.scenarios.manipulation.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/manipulator-java5/pom.xml b/ipojo/tests/manipulator/manipulator-java5/pom.xml
index ff2a824..218346f 100644
--- a/ipojo/tests/manipulator/manipulator-java5/pom.xml
+++ b/ipojo/tests/manipulator/manipulator-java5/pom.xml
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test.scenarios.manipulation.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/metadata/pom.xml b/ipojo/tests/manipulator/metadata/pom.xml
index 34df90a..56bcfc7 100644
--- a/ipojo/tests/manipulator/metadata/pom.xml
+++ b/ipojo/tests/manipulator/metadata/pom.xml
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test.scenarios.manipulation.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/primitives/pom.xml b/ipojo/tests/manipulator/primitives/pom.xml
index b69376f..2e24d24 100644
--- a/ipojo/tests/manipulator/primitives/pom.xml
+++ b/ipojo/tests/manipulator/primitives/pom.xml
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test.scenarios.manipulation.service
</Export-Package>
<Bundle-SymbolicName>
- ${pom.artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Private-Package>
org.apache.felix.ipojo.test*