servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r959125 - in /servicemix/smx4/nmr/trunk: ./ assembly/ branding/ document/ examples/cluster/ examples/interceptors/endpoint/ examples/interceptors/exchange/ examples/nmr/client/ examples/nmr/endpoint/ jbi/cluster/ jbi/cluster/config/ jbi/clu...
Date Tue, 29 Jun 2010 22:10:06 GMT
Author: ccustine
Date: Tue Jun 29 22:10:05 2010
New Revision: 959125

URL: http://svn.apache.org/viewvc?rev=959125&view=rev
Log:
SMX4-544 - Update poms to not have warnings with Maven 3

Modified:
    servicemix/smx4/nmr/trunk/assembly/pom.xml
    servicemix/smx4/nmr/trunk/branding/pom.xml
    servicemix/smx4/nmr/trunk/document/pom.xml
    servicemix/smx4/nmr/trunk/examples/cluster/pom.xml
    servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/pom.xml
    servicemix/smx4/nmr/trunk/examples/interceptors/exchange/pom.xml
    servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml
    servicemix/smx4/nmr/trunk/examples/nmr/endpoint/pom.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/pom.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml
    servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
    servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
    servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
    servicemix/smx4/nmr/trunk/naming/pom.xml
    servicemix/smx4/nmr/trunk/nmr/api/pom.xml
    servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
    servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
    servicemix/smx4/nmr/trunk/nmr/core/pom.xml
    servicemix/smx4/nmr/trunk/nmr/management/pom.xml
    servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
    servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
    servicemix/smx4/nmr/trunk/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/pom.xml
    servicemix/smx4/nmr/trunk/transaction/pom.xml

Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Tue Jun 29 22:10:05 2010
@@ -189,7 +189,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/main/filtered-resources</directory>
+                <directory>${project.basedir}/src/main/filtered-resources</directory>
                 <filtering>true</filtering>
                 <includes>
                     <include>**/*</include>
@@ -349,7 +349,7 @@
                             <descriptors>
                                 <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
                             </descriptors>
-                            <finalName>${pom.artifactId}-${pom.version}</finalName>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
                             <tarLongFileMode>gnu</tarLongFileMode>
                         </configuration>
                     </execution>
@@ -363,7 +363,7 @@
                             <descriptors>
                                 <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
                             </descriptors>
-                            <finalName>${pom.artifactId}-${pom.version}</finalName>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
                         </configuration>
                     </execution>
                     <execution>

Modified: servicemix/smx4/nmr/trunk/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/branding/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/branding/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/branding/pom.xml Tue Jun 29 22:10:05 2010
@@ -35,7 +35,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
+                <directory>${project.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
                     <include>**/*</include>
@@ -48,7 +48,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>*</Import-Package>
                         <Private-Package>!*</Private-Package>
                         <Export-Package>

Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Tue Jun 29 22:10:05 2010
@@ -81,9 +81,9 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${pom.artifactId},${pom.artifactId}.factory</Export-Package>
-                        <Private-Package>${pom.artifactId}.impl</Private-Package>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${project.artifactId},${project.artifactId}.factory</Export-Package>
+                        <Private-Package>${project.artifactId}.impl</Private-Package>
                         <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
                     </instructions>
                 </configuration>
@@ -91,4 +91,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/nmr/trunk/examples/cluster/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/cluster/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/cluster/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/cluster/pom.xml Tue Jun 29 22:10:05 2010
@@ -32,7 +32,7 @@
     <name>Apache ServiceMix NMR Example:: Cluster</name>
 
     <properties>
-        <servicemix.nmr.version>${pom.version}</servicemix.nmr.version>
+        <servicemix.nmr.version>${project.version}</servicemix.nmr.version>
         <servicemix.features.version>4.2.0</servicemix.features.version>
     </properties>
 

Modified: servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/pom.xml Tue Jun 29 22:10:05 2010
@@ -52,7 +52,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             org.apache.commons.logging,
                             org.apache.servicemix.nmr.api,

Modified: servicemix/smx4/nmr/trunk/examples/interceptors/exchange/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/interceptors/exchange/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/interceptors/exchange/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/interceptors/exchange/pom.xml Tue Jun 29 22:10:05 2010
@@ -52,7 +52,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             org.apache.commons.logging,
                             org.apache.servicemix.nmr.api,

Modified: servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml Tue Jun 29 22:10:05 2010
@@ -60,7 +60,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>org.apache.commons.logging, 
                                         org.apache.servicemix.nmr.api, 
                                         org.apache.servicemix.nmr.api.service,

Modified: servicemix/smx4/nmr/trunk/examples/nmr/endpoint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/nmr/endpoint/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/nmr/endpoint/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/nmr/endpoint/pom.xml Tue Jun 29 22:10:05 2010
@@ -49,7 +49,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>org.apache.commons.logging, org.apache.servicemix.nmr.api</Import-Package>
                         <Private-Package>org.apache.servicemix.nmr.examples.nmr.endpoint</Private-Package>
                     </instructions>

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml Tue Jun 29 22:10:05 2010
@@ -45,7 +45,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.jms,
                             org.apache.servicemix.nmr.api,
@@ -65,4 +65,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Tue Jun 29 22:10:05 2010
@@ -122,7 +122,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             *
                         </Import-Package>

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/pom.xml Tue Jun 29 22:10:05 2010
@@ -120,7 +120,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             *
                         </Import-Package>
@@ -139,4 +139,4 @@
     </build>
     -->
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml Tue Jun 29 22:10:05 2010
@@ -72,7 +72,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             org.apache.activemq*;resolution:=optional,
                             *
@@ -90,4 +90,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Tue Jun 29 22:10:05 2010
@@ -50,14 +50,14 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             org.osgi.service.command,
                             org.apache.felix.gogo.commands,
                             org.apache.felix.karaf.shell.console,
                             *
                         </Import-Package>
-                        <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+                        <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Tue Jun 29 22:10:05 2010
@@ -94,7 +94,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.transaction,
                             javax.management.loading,

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Tue Jun 29 22:10:05 2010
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.servicemix.platform.testing</groupId>
             <artifactId>org.apache.servicemix.platform.testing.support</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -319,8 +319,8 @@
             </plugin>
             <!-- Copy shared library and component -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>copy-components</id>

Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Tue Jun 29 22:10:05 2010
@@ -66,7 +66,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.jbi.component,
                             javax.management,

Modified: servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Tue Jun 29 22:10:05 2010
@@ -95,8 +95,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${pom.artifactId}*</Export-Package>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${project.artifactId}*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/nmr/trunk/naming/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/naming/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/naming/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/naming/pom.xml Tue Jun 29 22:10:05 2010
@@ -71,7 +71,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.xbean.naming.*;version="${xbean-version}"</Export-Package>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.servicemix.naming.Activator</Bundle-Activator>
                         <Export-Service>javax.naming.spi.InitialContextFactoryBuilder</Export-Service>
                         <DynamicImport-Package>*</DynamicImport-Package>

Modified: servicemix/smx4/nmr/trunk/nmr/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/pom.xml Tue Jun 29 22:10:05 2010
@@ -51,10 +51,10 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>${pom.name}</Bundle-Name>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>
-                            ${pom.artifactId},${pom.artifactId}.service,${pom.artifactId}.event,${pom.artifactId}.internal,${pom.artifactId}.security
+                            ${project.artifactId},${project.artifactId}.service,${project.artifactId}.event,${project.artifactId}.internal,${project.artifactId}.security
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -62,4 +62,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/pom.xml Tue Jun 29 22:10:05 2010
@@ -77,7 +77,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             org.osgi.service.command,
                             org.apache.felix.gogo.commands,
@@ -86,7 +86,7 @@
                             org.apache.servicemix.nmr.core,
                             *
                         </Import-Package>
-                        <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
+                        <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Tue Jun 29 22:10:05 2010
@@ -50,14 +50,14 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             org.osgi.service.command,
                             org.apache.felix.gogo.commands,
                             org.apache.felix.karaf.shell.console,
                             *
                         </Import-Package>
-                        <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+                        <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Tue Jun 29 22:10:05 2010
@@ -108,8 +108,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${pom.artifactId}*</Export-Package>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${project.artifactId}*</Export-Package>
                         <Import-Package>
                             org.apache.camel.*;resolution:=optional,
                             *

Modified: servicemix/smx4/nmr/trunk/nmr/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/management/pom.xml Tue Jun 29 22:10:05 2010
@@ -93,12 +93,12 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.management.loading,
                             *
                         </Import-Package>
-                        <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
+                        <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Tue Jun 29 22:10:05 2010
@@ -83,7 +83,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             org.apache.servicemix.document,
                             org.apache.servicemix.executors,

Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Tue Jun 29 22:10:05 2010
@@ -64,12 +64,12 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${pom.artifactId}</Export-Package>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${project.artifactId}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Jun 29 22:10:05 2010
@@ -290,52 +290,52 @@
       <dependency>
           <groupId>org.apache.servicemix.document</groupId>
           <artifactId>org.apache.servicemix.document</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
         <dependency>
             <groupId>org.apache.servicemix.naming</groupId>
             <artifactId>org.apache.servicemix.naming</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.api</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.commands</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.core</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.management</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.spring</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.audit</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.nmr</groupId>
           <artifactId>org.apache.servicemix.nmr.branding</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.specs</groupId>
@@ -345,53 +345,53 @@
       <dependency>
           <groupId>org.apache.servicemix.transaction</groupId>
           <artifactId>org.apache.servicemix.transaction</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi</groupId>
           <artifactId>org.apache.servicemix.jbi.commands</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi</groupId>
           <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi</groupId>
           <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi</groupId>
           <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi</groupId>
           <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
           <type>test-jar</type>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi.cluster</groupId>
           <artifactId>cluster</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi.cluster</groupId>
           <artifactId>org.apache.servicemix.jbi.cluster.requestor</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi.cluster</groupId>
           <artifactId>org.apache.servicemix.jbi.cluster.engine</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.jbi.cluster</groupId>
           <artifactId>org.apache.servicemix.jbi.cluster.config</artifactId>
-          <version>${pom.version}</version>
+          <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.specs</groupId>
@@ -958,14 +958,17 @@
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.5</version>
           </plugin>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-jxr-plugin</artifactId>
+              <version>2.0</version>
           </plugin>
           <plugin>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>cobertura-maven-plugin</artifactId>
+              <version>2.2</version>
           </plugin>
       </plugins>
   </reporting>

Modified: servicemix/smx4/nmr/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/testing/support/pom.xml Tue Jun 29 22:10:05 2010
@@ -150,7 +150,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.management,
                             org.springframework.jmx.support,

Modified: servicemix/smx4/nmr/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/transaction/pom.xml?rev=959125&r1=959124&r2=959125&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/transaction/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/transaction/pom.xml Tue Jun 29 22:10:05 2010
@@ -97,7 +97,7 @@
                             org.objectweb.howl.log*,
                             org.apache.servicemix.transaction
                         </Private-Package>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.servicemix.transaction.Activator</Bundle-Activator>
                         <Export-Service>javax.transaction.TransactionManager,javax.transaction.TransactionSynchronizationRegistry,javax.transaction.UserTransaction,org.apache.geronimo.transaction.manager.RecoverableTransactionManager</Export-Service>
                         <Include-Resource>



Mime
View raw message