servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1149577 - in /servicemix/smx5/trunk: manual/pom.xml pom.xml
Date Fri, 22 Jul 2011 11:49:30 GMT
Author: jbonofre
Date: Fri Jul 22 11:49:30 2011
New Revision: 1149577

URL: http://svn.apache.org/viewvc?rev=1149577&view=rev
Log:
Fix maven build warning.

Modified:
    servicemix/smx5/trunk/manual/pom.xml
    servicemix/smx5/trunk/pom.xml

Modified: servicemix/smx5/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/manual/pom.xml?rev=1149577&r1=1149576&r2=1149577&view=diff
==============================================================================
--- servicemix/smx5/trunk/manual/pom.xml (original)
+++ servicemix/smx5/trunk/manual/pom.xml Fri Jul 22 11:49:30 2011
@@ -101,25 +101,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/webapp</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>cmdhelp-maven-plugin</artifactId>
                 <version>${karaf-version}</version>
@@ -217,6 +198,18 @@
                 <version>1.5</version>
                 <executions>
                     <execution>
+                        <id>add-source</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/webapp</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>attach-artifacts</id>
                         <phase>install</phase>
                         <goals>

Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1149577&r1=1149576&r2=1149577&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Fri Jul 22 11:49:30 2011
@@ -197,6 +197,16 @@
                         <scalaVersion>${scala-version}</scalaVersion>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.3.5</version>
+                </plugin>
              </plugins>
         </pluginManagement>
     </build>



Mime
View raw message