Skip to content

Commit

Permalink
merge -r 633703:633713 from branch
Browse files Browse the repository at this point in the history
  • Loading branch information
olamy committed Mar 4, 2008
1 parent 4ee37c8 commit ecbb290
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-parent</artifactId>
<version>1.1-SNAPSHOT</version>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
<artifactId>continuum-webapp-test</artifactId>
<name>Continuum Webapp Test</name>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-webapp</artifactId>
<type>war</type>
</dependency>
Expand All @@ -46,7 +46,7 @@
the webapp because they are provided by appserver
-->
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-configuration</artifactId>
</dependency>
<dependency>
Expand All @@ -58,11 +58,11 @@
<artifactId>maven-app-configuration-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-security</artifactId>
</dependency>
<dependency> <!-- added since depMgt doesn't override imported dependencies -->
Expand Down Expand Up @@ -158,23 +158,23 @@
<artifactId>maven-scm-provider-vss</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-notifier-irc</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-notifier-jabber</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-notifier-msn</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-notifier-wagon</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-xmlrpc</artifactId>
</dependency>
<dependency>
Expand Down

0 comments on commit ecbb290

Please sign in to comment.