camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r880884 - in /camel/trunk: ./ apache-camel/ components/camel-blueprint/ components/camel-spring/ components/camel-web/ examples/camel-example-bam/ examples/camel-example-docs/ examples/camel-example-etl/ examples/camel-example-guice-jms/ ex...
Date Mon, 16 Nov 2009 18:16:50 GMT
Author: janstey
Date: Mon Nov 16 18:16:48 2009
New Revision: 880884

URL: http://svn.apache.org/viewvc?rev=880884&view=rev
Log:
CAMEL-2179 - clean up some warnings coming from Maven 3

Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/components/camel-blueprint/pom.xml
    camel/trunk/components/camel-spring/pom.xml
    camel/trunk/components/camel-web/pom.xml
    camel/trunk/examples/camel-example-bam/pom.xml
    camel/trunk/examples/camel-example-docs/pom.xml
    camel/trunk/examples/camel-example-etl/pom.xml
    camel/trunk/examples/camel-example-guice-jms/pom.xml
    camel/trunk/examples/camel-example-management/pom.xml
    camel/trunk/examples/camel-example-osgi/pom.xml
    camel/trunk/examples/camel-example-pojo-messaging/pom.xml
    camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
    camel/trunk/examples/camel-example-spring-xquery/pom.xml
    camel/trunk/examples/camel-example-spring/pom.xml
    camel/trunk/examples/camel-example-tracer/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/pom.xml
    camel/trunk/tests/test-bundles/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/camel-manual/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Mon Nov 16 18:16:48 2009
@@ -410,10 +410,10 @@
               <outputDirectory>${project.build.directory}</outputDirectory>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${pom.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>camel-bundle</artifactId>
-                  <version>${pom.version}</version>
-                  <destFileName>${pom.artifactId}-${pom.version}.jar</destFileName>
+                  <version>${project.version}</version>
+                  <destFileName>${project.artifactId}-${project.version}.jar</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>
@@ -435,7 +435,7 @@
               <descriptors>
                 <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
               </descriptors>
-              <finalName>${pom.artifactId}-${pom.version}</finalName>
+              <finalName>${project.artifactId}-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
@@ -449,7 +449,7 @@
               <descriptors>
                 <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
               </descriptors>
-              <finalName>${pom.artifactId}-${pom.version}</finalName>
+              <finalName>${project.artifactId}-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
@@ -520,10 +520,10 @@
                   <outputDirectory>${project.build.directory}/javadoc/camel-core</outputDirectory>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>${pom.groupId}</groupId>
+                      <groupId>${project.groupId}</groupId>
                       <artifactId>camel-core</artifactId>
                       <classifier>javadoc</classifier>
-                      <version>${pom.version}</version>
+                      <version>${project.version}</version>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -538,10 +538,10 @@
                   <outputDirectory>${project.build.directory}/javadoc/camel-spring</outputDirectory>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>${pom.groupId}</groupId>
+                      <groupId>${project.groupId}</groupId>
                       <artifactId>camel-spring</artifactId>
                       <classifier>javadoc</classifier>
-                      <version>${pom.version}</version>
+                      <version>${project.version}</version>
                     </artifactItem>
                   </artifactItems>
                 </configuration>

Modified: camel/trunk/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Mon Nov 16 18:16:48 2009
@@ -209,7 +209,7 @@
                             <artifactItem>
                                 <groupId>org.apache.camel</groupId>
                                 <artifactId>camel-blueprint</artifactId>
-                                <version>${pom.version}</version>
+                                <version>${project.version}</version>
                                 <type>jar</type>
                                 <overWrite>false</overWrite>
                                 <outputDirectory>${project.build.directory}/schema</outputDirectory>

Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Mon Nov 16 18:16:48 2009
@@ -252,7 +252,7 @@
                         <artifactItem>
                             <groupId>org.apache.camel</groupId>
                             <artifactId>camel-spring</artifactId>
-                            <version>${pom.version}</version>
+                            <version>${project.version}</version>
                             <type>jar</type>
                             <overWrite>false</overWrite>
                             <outputDirectory>${project.build.directory}/schema</outputDirectory>

Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Mon Nov 16 18:16:48 2009
@@ -482,7 +482,7 @@
               <artifactItem>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-web</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
                 <type>xsd</type>
                 <overWrite>false</overWrite>
                 <outputDirectory>${project.build.directory}/schema</outputDirectory>

Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Mon Nov 16 18:16:48 2009
@@ -95,7 +95,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
 
       <!-- Allows the example to be run via 'mvn compile exec:java' -->
@@ -117,7 +117,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-docs/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-docs/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-docs/pom.xml (original)
+++ camel/trunk/examples/camel-example-docs/pom.xml Mon Nov 16 18:16:48 2009
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
 
     </plugins>
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-etl/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ camel/trunk/examples/camel-example-etl/pom.xml Mon Nov 16 18:16:48 2009
@@ -99,7 +99,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
 
       <!-- Allows the example to be run via 'mvn compile exec:java' -->
@@ -132,7 +132,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-guice-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-guice-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-guice-jms/pom.xml Mon Nov 16 18:16:48 2009
@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>guice-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
 
       <!-- Allows the example to be run via 'mvn compile exec:java' -->
@@ -111,7 +111,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-management/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-management/pom.xml (original)
+++ camel/trunk/examples/camel-example-management/pom.xml Mon Nov 16 18:16:48 2009
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-maven-plugin</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
             </plugin>
         </plugins>
     </build>
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-maven-plugin</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
             </plugin>
         </plugins>
     </reporting>

Modified: camel/trunk/examples/camel-example-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-osgi/pom.xml Mon Nov 16 18:16:48 2009
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
 
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-pojo-messaging/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-pojo-messaging/pom.xml (original)
+++ camel/trunk/examples/camel-example-pojo-messaging/pom.xml Mon Nov 16 18:16:48 2009
@@ -92,7 +92,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
 
     </plugins>
@@ -104,7 +104,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/pom.xml Mon Nov 16 18:16:48 2009
@@ -79,7 +79,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <configuration>
             <duration>5s</duration>
             <configClasses>org.apache.camel.example.spring.javaconfig.MyRouteConfig</configClasses>
@@ -98,7 +98,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-spring-xquery/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-xquery/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-xquery/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-xquery/pom.xml Mon Nov 16 18:16:48 2009
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
 
@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <configuration>
           <duration>30s</duration>
           <!-- lets disable the DOT file conversion as a test -->

Modified: camel/trunk/examples/camel-example-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring/pom.xml Mon Nov 16 18:16:48 2009
@@ -79,7 +79,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
       
       <!-- 
@@ -109,7 +109,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>

Modified: camel/trunk/examples/camel-example-tracer/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/pom.xml (original)
+++ camel/trunk/examples/camel-example-tracer/pom.xml Mon Nov 16 18:16:48 2009
@@ -85,7 +85,7 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-maven-plugin</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
             </plugin>
 
             <!-- Allows the example to be run via 'mvn compile exec:java' -->
@@ -107,7 +107,7 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-maven-plugin</artifactId>
-                <version>${pom.version}</version>
+                <version>${project.version}</version>
             </plugin>
         </plugins>
     </reporting>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Nov 16 18:16:48 2009
@@ -140,7 +140,7 @@
     <camel.osgi.split.pkg>-split-package:=first</camel.osgi.split.pkg>
     <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
     <camel.osgi.dynamic />
-    <camel.osgi.symbolic.name>${groupId}.${artifactId}</camel.osgi.symbolic.name>
+    <camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
     <camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
 
     <!-- encoding -->

Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Mon Nov 16 18:16:48 2009
@@ -345,7 +345,7 @@
 	    <configuration>
               <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
 	      <instructions>
-	        <Bundle-Name>${artifactId}</Bundle-Name>
+	        <Bundle-Name>${project.artifactId}</Bundle-Name>
 	        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
             <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
 	        <Export-Package>${camel.osgi.export}</Export-Package>

Modified: camel/trunk/tests/test-bundles/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/test-bundles/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tests/test-bundles/pom.xml (original)
+++ camel/trunk/tests/test-bundles/pom.xml Mon Nov 16 18:16:48 2009
@@ -64,7 +64,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>${camel.osgi.export}</Export-Package>
                         <Import-Package>${camel.osgi.import.pkg}*</Import-Package>
                         <Private-Package>${camel.osgi.private.pkg}</Private-Package>

Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
Mon Nov 16 18:16:48 2009
@@ -21,8 +21,8 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
+  <groupId>${project.groupId}</groupId>
+  <artifactId>${project.artifactId}</artifactId>
   <packaging>jar</packaging>
   <version>${version}</version>
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
Mon Nov 16 18:16:48 2009
@@ -21,8 +21,8 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
+  <groupId>${project.groupId}</groupId>
+  <artifactId>${project.artifactId}</artifactId>
   <packaging>jar</packaging>
   <version>${version}</version>
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
Mon Nov 16 18:16:48 2009
@@ -21,8 +21,8 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
+  <groupId>${project.groupId}</groupId>
+  <artifactId>${project.artifactId}</artifactId>
   <packaging>jar</packaging>
   <version>${version}</version>
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Mon Nov 16 18:16:48 2009
@@ -21,8 +21,8 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
+  <groupId>${project.groupId}</groupId>
+  <artifactId>${project.artifactId}</artifactId>
   <packaging>bundle</packaging>
   <version>${version}</version>
 
@@ -63,8 +63,8 @@
 	    <configuration>
           <excludeDependencies>true</excludeDependencies>
 	      <instructions>
-	        <Bundle-Name>${artifactId}</Bundle-Name>
-	        <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+	        <Bundle-Name>${project.artifactId}</Bundle-Name>
+	        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 	        <Export-Package>${package}*</Export-Package>
 	        <Implementation-Title>Apache Camel Scala DSL Router</Implementation-Title>
 	        <Implementation-Version>${project.version}</Implementation-Version>

Modified: camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
Mon Nov 16 18:16:48 2009
@@ -21,8 +21,8 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
+  <groupId>${project.groupId}</groupId>
+  <artifactId>${project.artifactId}</artifactId>
   <packaging>jar</packaging>
   <version>${version}</version>
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
Mon Nov 16 18:16:48 2009
@@ -21,8 +21,8 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
+  <groupId>${project.groupId}</groupId>
+  <artifactId>${project.artifactId}</artifactId>
   <version>${version}</version>
 
   <name>Camel Router Application</name>

Modified: camel/trunk/tooling/camel-manual/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=880884&r1=880883&r2=880884&view=diff
==============================================================================
--- camel/trunk/tooling/camel-manual/pom.xml (original)
+++ camel/trunk/tooling/camel-manual/pom.xml Mon Nov 16 18:16:48 2009
@@ -54,7 +54,7 @@
               <style type="text/css">
                 @page :left {
                   @top-left {
-                    content: "Apache Camel ${pom.version} Developer's Manual";
+                    content: "Apache Camel ${project.version} Developer's Manual";
                   }
                 }
               </style>
@@ -63,7 +63,7 @@
               <h3 id="replaceme">.*</h3>
           ]]></replaceToken>
           <replaceValue><![CDATA[
-              <h3>Version ${pom.version}</h3>
+              <h3>Version ${project.version}</h3>
           ]]></replaceValue>
         </configuration>
       </plugin>



Mime
View raw message