Fixing deprecated pom.* property references for Maven 3.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@944771 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/shell/commands/pom.xml b/karaf/shell/commands/pom.xml
index c6da26b..338167e 100644
--- a/karaf/shell/commands/pom.xml
+++ b/karaf/shell/commands/pom.xml
@@ -59,7 +59,7 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
@@ -72,9 +72,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/config/pom.xml b/karaf/shell/config/pom.xml
index 1867e3d..c94217b 100644
--- a/karaf/shell/config/pom.xml
+++ b/karaf/shell/config/pom.xml
@@ -73,9 +73,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/console/pom.xml b/karaf/shell/console/pom.xml
index 949f842..6a16188 100644
--- a/karaf/shell/console/pom.xml
+++ b/karaf/shell/console/pom.xml
@@ -76,13 +76,13 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
<resource>
- <directory>${pom.basedir}/src/main/filtered-resources</directory>
+ <directory>${project.basedir}/src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
@@ -115,7 +115,7 @@
</Import-Package>
<Export-Package>
org.apache.felix.gogo.commands*;version=${felix.gogo.version},
- org.apache.felix.karaf.shell.console*;version=${pom.version},
+ org.apache.felix.karaf.shell.console*;version=${project.version},
org.fusesource.jansi;version=${jansi.version},
jline;version=${jline.version}
</Export-Package>
diff --git a/karaf/shell/console/src/main/filtered-resources/org/apache/felix/karaf/shell/console/branding.properties b/karaf/shell/console/src/main/filtered-resources/org/apache/felix/karaf/shell/console/branding.properties
index 1a45ab6..5b62a4f 100644
--- a/karaf/shell/console/src/main/filtered-resources/org/apache/felix/karaf/shell/console/branding.properties
+++ b/karaf/shell/console/src/main/filtered-resources/org/apache/felix/karaf/shell/console/branding.properties
@@ -24,7 +24,7 @@
\u001B[36m / /| |/ /_/ / / / /_/ / __/ \u001B[0m\r\n\
\u001B[36m /_/ |_|\\__,_/_/ \\__,_/_/ \u001B[0m\r\n\
\r\n\
-\u001B[1m Apache Felix Karaf\u001B[0m (${pom.version})\r\n\
+\u001B[1m Apache Felix Karaf\u001B[0m (${project.version})\r\n\
\r\n\
Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\r\n\
and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\r\n\
diff --git a/karaf/shell/dev/pom.xml b/karaf/shell/dev/pom.xml
index 406df26..f55442d 100644
--- a/karaf/shell/dev/pom.xml
+++ b/karaf/shell/dev/pom.xml
@@ -67,9 +67,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/log/pom.xml b/karaf/shell/log/pom.xml
index 4edad8d..e380664 100644
--- a/karaf/shell/log/pom.xml
+++ b/karaf/shell/log/pom.xml
@@ -79,9 +79,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/obr/pom.xml b/karaf/shell/obr/pom.xml
index 543b2c3..31efe69 100644
--- a/karaf/shell/obr/pom.xml
+++ b/karaf/shell/obr/pom.xml
@@ -67,10 +67,10 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- ${pom.artifactId}*;version=${project.version}
+ ${project.artifactId}*;version=${project.version}
</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/osgi/pom.xml b/karaf/shell/osgi/pom.xml
index 1e117cd..acef056 100644
--- a/karaf/shell/osgi/pom.xml
+++ b/karaf/shell/osgi/pom.xml
@@ -77,9 +77,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/packages/pom.xml b/karaf/shell/packages/pom.xml
index 0384bea..d0f5e7a 100644
--- a/karaf/shell/packages/pom.xml
+++ b/karaf/shell/packages/pom.xml
@@ -67,9 +67,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/ssh/pom.xml b/karaf/shell/ssh/pom.xml
index 65ae81d..1081a21 100644
--- a/karaf/shell/ssh/pom.xml
+++ b/karaf/shell/ssh/pom.xml
@@ -73,7 +73,7 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
@@ -86,9 +86,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/wrapper/pom.xml b/karaf/shell/wrapper/pom.xml
index 384f011..a7aa645 100644
--- a/karaf/shell/wrapper/pom.xml
+++ b/karaf/shell/wrapper/pom.xml
@@ -56,13 +56,13 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
<resource>
- <directory>${pom.basedir}/src/main/filtered-resources</directory>
+ <directory>${project.basedir}/src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
@@ -83,9 +83,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${pom.artifactId}*,
+ !${project.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,