continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r634838 - in /continuum/trunk: continuum-notifiers/continuum-notifier-wagon/pom.xml continuum-notifiers/continuum-notifier-wagon/src/test/resources/log4j.properties pom.xml
Date Fri, 07 Mar 2008 22:07:28 GMT
Author: olamy
Date: Fri Mar  7 14:07:27 2008
New Revision: 634838

URL: http://svn.apache.org/viewvc?rev=634838&view=rev
Log:
merge -r 633713:634837 from branch 1.x

Added:
    continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/log4j.properties
      - copied unchanged from r634837, continuum/branches/continuum-1.x/continuum-notifiers/continuum-notifier-wagon/src/test/resources/log4j.properties
Modified:
    continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=634838&r1=634837&r2=634838&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml Fri Mar  7 14:07:27
2008
@@ -28,6 +28,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-provider-api</artifactId>
+    </dependency>      
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-webdav</artifactId>
       <scope>test</scope>
     </dependency>
@@ -46,6 +50,13 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>-noverify</argLine>
+        </configuration>    
+      </plugin>		
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=634838&r1=634837&r2=634838&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Fri Mar  7 14:07:27 2008
@@ -30,14 +30,11 @@
   <packaging>pom</packaging>
   <name>Continuum Project</name>
   <version>2.0-SNAPSHOT</version>
-  <url>http://maven.apache.org/continuum</url>
+
   <prerequisites>
     <maven>2.0.7</maven>
   </prerequisites>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/CONTINUUM</url>
-  </issueManagement>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/continuum/trunk/</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/continuum/trunk/</developerConnection>
@@ -111,7 +108,7 @@
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-maven-plugin</artifactId>
-          <version>1.3.3</version>
+          <version>1.3.4</version>
           <extensions>true</extensions>
         </plugin>
         <plugin>
@@ -156,6 +153,15 @@
       <name>Java.net Repository for Maven</name>
       <url>http://download.java.net/maven/2/</url>
     </repository>
+    <!-- comment when parent is released -->
+    <repository>
+      <id>people.apache.org</id>
+      <name>Apache Snapshot Development Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
   </repositories>
   <!--
   uncomment if snapshot plugins are needed
@@ -619,8 +625,13 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.5.0</version>
+      </dependency>      
+      <dependency>
+        <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.2</version>
+        <version>1.5.0</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>



Mime
View raw message