camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1178510 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml pom.xml
Date Mon, 03 Oct 2011 18:39:05 GMT
Author: dkulp
Date: Mon Oct  3 18:39:04 2011
New Revision: 1178510

URL: http://svn.apache.org/viewvc?rev=1178510&view=rev
Log:
Merged revisions 1178509 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1178509 | dkulp | 2011-10-03 14:37:40 -0400 (Mon, 03 Oct 2011) | 2 lines
  
  Move jetty plugin config to parent pom as that's where the jetty version
  is defined.
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/parent/pom.xml
    camel/branches/camel-2.8.x/pom.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /camel/trunk:1178509

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1178510&r1=1178509&r2=1178510&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Oct  3 18:39:04 2011
@@ -1516,6 +1516,12 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-maven-plugin</artifactId>
+          <version>${jetty-version}</version>
+        </plugin>
+
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
           <configuration>

Modified: camel/branches/camel-2.8.x/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/pom.xml?rev=1178510&r1=1178509&r2=1178510&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/pom.xml (original)
+++ camel/branches/camel-2.8.x/pom.xml Mon Oct  3 18:39:04 2011
@@ -277,12 +277,6 @@
         </plugin>
   
         <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
-          <version>${jetty-version}</version>
-        </plugin>
-  
-        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.6</version>



Mime
View raw message