More build fixes for Maven 3.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@944774 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index b0ac772..299def9 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -360,14 +360,14 @@
<artifactId>manual</artifactId>
<type>pdf</type>
<outputDirectory>target/dependencies</outputDirectory>
- <destFileName>karaf-manual-${version}.pdf</destFileName>
+ <destFileName>karaf-manual-${project.version}.pdf</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix.karaf</groupId>
<artifactId>manual</artifactId>
<type>html</type>
<outputDirectory>target/dependencies</outputDirectory>
- <destFileName>karaf-manual-${version}.html</destFileName>
+ <destFileName>karaf-manual-${project.version}.html</destFileName>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index 35b2d63..211dcf2 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -120,8 +120,8 @@
</file>
<file>
<source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${version}</outputDirectory>
- <destName>apache-felix-karaf-${version}-features.xml</destName>
+ <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${project.version}</outputDirectory>
+ <destName>apache-felix-karaf-${project.version}-features.xml</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index 6e5a5f2..307d319 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -112,8 +112,8 @@
</file>
<file>
<source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${version}</outputDirectory>
- <destName>apache-felix-karaf-${version}-features.xml</destName>
+ <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${project.version}</outputDirectory>
+ <destName>apache-felix-karaf-${project.version}-features.xml</destName>
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
diff --git a/karaf/assembly/src/main/filtered-resources/demos/web/README.txt b/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
index 46635c7..955f047 100644
--- a/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
+++ b/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
@@ -80,8 +80,8 @@
In this case, you should see output similar to the following:
State Version Name Repository
-[uninstalled] [2.5.6.SEC01] spring karaf-${version}
-[uninstalled] [1.2.0 ] spring-dm karaf-${version}
+[uninstalled] [2.5.6.SEC01] spring karaf-${project.version}
+[uninstalled] [1.2.0 ] spring-dm karaf-${project.version}
[uninstalled] [${pom.version}] wrapper karaf-${pom.version}
[uninstalled] [${pom.version}] obr karaf-${pom.version}
[uninstalled] [${pom.version}] http karaf-${pom.version}
@@ -102,7 +102,7 @@
mvn package
-Maven builds the web application, web-${version}.war, and
+Maven builds the web application, web-${project.version}.war, and
saves it in the target directory of this example. Deploy this
WAR file to your favorite web container. Once the application
is running, you can test it using the Apache Felix Karaf client
diff --git a/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg b/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
index daaf02d..a3d4a82 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
+++ b/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${version}/xml/features
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${project.version}/xml/features
#
# Comma separated list of features to install at startup
diff --git a/karaf/assembly/src/main/filtered-resources/features.xml b/karaf/assembly/src/main/filtered-resources/features.xml
index ce0550e..f523666 100644
--- a/karaf/assembly/src/main/filtered-resources/features.xml
+++ b/karaf/assembly/src/main/filtered-resources/features.xml
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="karaf-${version}">
+<features name="karaf-${project.version}">
<feature name="spring" version="${spring.version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
@@ -32,16 +32,16 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.spring/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.spring/${project.version}</bundle>
</feature>
- <feature name="wrapper" version="${version}">
- <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.wrapper/${version}</bundle>
+ <feature name="wrapper" version="${project.version}">
+ <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.wrapper/${project.version}</bundle>
</feature>
- <feature name="obr" version="${version}">
+ <feature name="obr" version="${project.version}">
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.obr/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.obr/${project.version}</bundle>
</feature>
- <feature name="http" version="${version}">
+ <feature name="http" version="${project.version}">
<config name="org.ops4j.pax.web">
org.osgi.service.http.port=8181
</config>
@@ -52,28 +52,28 @@
<bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
</feature>
- <feature name="war" version="${version}">
- <feature version="${version}">http</feature>
+ <feature name="war" version="${project.version}">
+ <feature version="${project.version}">http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.war/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.war/${project.version}</bundle>
</feature>
- <feature name="webconsole" version="${version}">
- <feature version="${version}">http</feature>
+ <feature name="webconsole" version="${project.version}">
+ <feature version="${project.version}">http</feature>
<config name="org.apache.felix.webconsole.internal.servlet.OsgiManager">
username=karaf
password=karaf
</config>
<bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.branding/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.branding/${project.version}</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.admin/${version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.features/${version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.gogo/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.admin/${project.version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.features/${project.version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.gogo/${project.version}</bundle>
</feature>
- <feature name="ssh" version="${version}">
+ <feature name="ssh" version="${project.version}">
<config name="org.apache.felix.karaf.shell.ssh">
sshPort=8101
sshHost=0.0.0.0
@@ -81,10 +81,10 @@
</config>
<bundle>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
<bundle>mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.ssh/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.ssh/${project.version}</bundle>
</feature>
- <feature name="management" version="${version}">
- <bundle>mvn:org.apache.felix.karaf/org.apache.felix.karaf.management/${version}</bundle>
+ <feature name="management" version="${project.version}">
+ <bundle>mvn:org.apache.felix.karaf/org.apache.felix.karaf.management/${project.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
</feature>
diff --git a/karaf/jaas/modules/pom.xml b/karaf/jaas/modules/pom.xml
index 4f10c44..df83275 100644
--- a/karaf/jaas/modules/pom.xml
+++ b/karaf/jaas/modules/pom.xml
@@ -81,7 +81,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 7014069..a461df0 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
<version>1.2.1</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.felix.karaf</groupId>
@@ -822,6 +823,16 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -909,6 +920,21 @@
<artifactId>maven-jxr-plugin</artifactId>
<version>2.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
</plugins>
</reporting>
diff --git a/karaf/shell/commands/pom.xml b/karaf/shell/commands/pom.xml
index 338167e..4d02488 100644
--- a/karaf/shell/commands/pom.xml
+++ b/karaf/shell/commands/pom.xml
@@ -71,7 +71,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/shell/config/pom.xml b/karaf/shell/config/pom.xml
index c94217b..58c7956 100644
--- a/karaf/shell/config/pom.xml
+++ b/karaf/shell/config/pom.xml
@@ -72,7 +72,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/shell/console/pom.xml b/karaf/shell/console/pom.xml
index 6a16188..4871c84 100644
--- a/karaf/shell/console/pom.xml
+++ b/karaf/shell/console/pom.xml
@@ -102,7 +102,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
!org.apache.felix.karaf.shell.console*,
!org.apache.felix.gogo.commands*,
diff --git a/karaf/shell/dev/pom.xml b/karaf/shell/dev/pom.xml
index f55442d..deb0644 100644
--- a/karaf/shell/dev/pom.xml
+++ b/karaf/shell/dev/pom.xml
@@ -66,7 +66,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/shell/log/pom.xml b/karaf/shell/log/pom.xml
index e380664..cecfad9 100644
--- a/karaf/shell/log/pom.xml
+++ b/karaf/shell/log/pom.xml
@@ -78,7 +78,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/shell/obr/pom.xml b/karaf/shell/obr/pom.xml
index 31efe69..c0df42a 100644
--- a/karaf/shell/obr/pom.xml
+++ b/karaf/shell/obr/pom.xml
@@ -65,7 +65,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
${project.artifactId}*;version=${project.version}
</Export-Package>
diff --git a/karaf/shell/osgi/pom.xml b/karaf/shell/osgi/pom.xml
index acef056..d8997d3 100644
--- a/karaf/shell/osgi/pom.xml
+++ b/karaf/shell/osgi/pom.xml
@@ -76,7 +76,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/shell/packages/pom.xml b/karaf/shell/packages/pom.xml
index d0f5e7a..ca281c5 100644
--- a/karaf/shell/packages/pom.xml
+++ b/karaf/shell/packages/pom.xml
@@ -66,7 +66,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/shell/ssh/pom.xml b/karaf/shell/ssh/pom.xml
index 1081a21..9bbf2e4 100644
--- a/karaf/shell/ssh/pom.xml
+++ b/karaf/shell/ssh/pom.xml
@@ -85,7 +85,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
diff --git a/karaf/shell/wrapper/pom.xml b/karaf/shell/wrapper/pom.xml
index a7aa645..2fed151 100644
--- a/karaf/shell/wrapper/pom.xml
+++ b/karaf/shell/wrapper/pom.xml
@@ -82,7 +82,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,