Return-Path: 
 <commits-return-12431-apmail-felix-commits-archive=felix.apache.org@felix.apache.org>
Delivered-To: apmail-felix-commits-archive@www.apache.org
Received: (qmail 74325 invoked from network); 16 May 2010 08:50:44 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 16 May 2010 08:50:44 -0000
Received: (qmail 44754 invoked by uid 500); 16 May 2010 08:50:43 -0000
Delivered-To: apmail-felix-commits-archive@felix.apache.org
Received: (qmail 44666 invoked by uid 500); 16 May 2010 08:50:42 -0000
Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@felix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@felix.apache.org>
List-Post: <mailto:commits@felix.apache.org>
List-Id: <commits.felix.apache.org>
Reply-To: dev@felix.apache.org
Delivered-To: mailing list commits@felix.apache.org
Received: (qmail 44659 invoked by uid 99); 16 May 2010 08:50:41 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 May 2010 08:50:41 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 May 2010 08:50:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 403C123889BF; Sun, 16 May 2010 08:50:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r944774 - in /felix/trunk/karaf: ./ assembly/
 assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
 assembly/src/main/filtered-resources/demos/web/
 assembly/src/main/filtered-resources/etc/ jaas/modules/ shell/commands/
 shell...
Date: Sun, 16 May 2010 08:50:14 -0000
To: commits@felix.apache.org
From: ccustine@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100516085015.403C123889BF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ccustine
Date: Sun May 16 08:50:14 2010
New Revision: 944774

URL: http://svn.apache.org/viewvc?rev=944774&view=rev
Log:
More build fixes for Maven 3.

Modified:
    felix/trunk/karaf/assembly/pom.xml
    felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
    felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
    felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
    felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
    felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
    felix/trunk/karaf/jaas/modules/pom.xml
    felix/trunk/karaf/pom.xml
    felix/trunk/karaf/shell/commands/pom.xml
    felix/trunk/karaf/shell/config/pom.xml
    felix/trunk/karaf/shell/console/pom.xml
    felix/trunk/karaf/shell/dev/pom.xml
    felix/trunk/karaf/shell/log/pom.xml
    felix/trunk/karaf/shell/obr/pom.xml
    felix/trunk/karaf/shell/osgi/pom.xml
    felix/trunk/karaf/shell/packages/pom.xml
    felix/trunk/karaf/shell/ssh/pom.xml
    felix/trunk/karaf/shell/wrapper/pom.xml

Modified: felix/trunk/karaf/assembly/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Sun May 16 08:50:14 2010
@@ -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>

Modified: felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml Sun May 16 08:50:14 2010
@@ -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>

Modified: felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml Sun May 16 08:50:14 2010
@@ -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>

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt Sun May 16 08:50:14 2010
@@ -80,8 +80,8 @@ try executing the "features:list" comman
 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 @@ container, by completing the following s
 
      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

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg Sun May 16 08:50:14 2010
@@ -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

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml Sun May 16 08:50:14 2010
@@ -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>

Modified: felix/trunk/karaf/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/modules/pom.xml (original)
+++ felix/trunk/karaf/jaas/modules/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Sun May 16 08:50:14 2010
@@ -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>
 

Modified: felix/trunk/karaf/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/commands/pom.xml (original)
+++ felix/trunk/karaf/shell/commands/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/config/pom.xml (original)
+++ felix/trunk/karaf/shell/config/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/console/pom.xml (original)
+++ felix/trunk/karaf/shell/console/pom.xml Sun May 16 08:50:14 2010
@@ -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*,

Modified: felix/trunk/karaf/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/dev/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/dev/pom.xml (original)
+++ felix/trunk/karaf/shell/dev/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/log/pom.xml (original)
+++ felix/trunk/karaf/shell/log/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/pom.xml (original)
+++ felix/trunk/karaf/shell/obr/pom.xml Sun May 16 08:50:14 2010
@@ -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>

Modified: felix/trunk/karaf/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/osgi/pom.xml (original)
+++ felix/trunk/karaf/shell/osgi/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/packages/pom.xml (original)
+++ felix/trunk/karaf/shell/packages/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/ssh/pom.xml (original)
+++ felix/trunk/karaf/shell/ssh/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,

Modified: felix/trunk/karaf/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/pom.xml?rev=944774&r1=944773&r2=944774&view=diff
==============================================================================
--- felix/trunk/karaf/shell/wrapper/pom.xml (original)
+++ felix/trunk/karaf/shell/wrapper/pom.xml Sun May 16 08:50:14 2010
@@ -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}*,