You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by tr...@apache.org on 2005/07/28 02:08:11 UTC
svn commit: r225659 - in /maven/continuum/branches/trygvis-test: ./
continuum-core-it/src/test/java/org/apache/maven/continuum/it/
continuum-core/
continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/
continuum-plexus-application/...
Author: trygvis
Date: Wed Jul 27 17:07:58 2005
New Revision: 225659
URL: http://svn.apache.org/viewcvs?rev=225659&view=rev
Log:
o Updates from trunk.
Modified:
maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
maven/continuum/branches/trygvis-test/continuum-core/pom.xml
maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml
maven/continuum/branches/trygvis-test/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/META-INF/plexus/components.xml
maven/continuum/branches/trygvis-test/pom.xml
Modified: maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java?rev=225659&r1=225658&r2=225659&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java Wed Jul 27 17:07:58 2005
@@ -64,7 +64,12 @@
MavenTwoBuildExecutor.ID,
project );
- assertEquals( "project.notifiers.size", 1, project.getNotifiers().size() );
+ assertEquals( "project.notifiers.size", 2, project.getNotifiers().size() );
+
+ //TODO: Activate this test when CONTINUUM-252 will be fixed
+ //removeNotifier( projectId, ( (ContinuumNotifier) project.getNotifiers().get( 1 ) ).getType() );
+
+ //assertEquals( "project.notifiers.size", 1, project.getNotifiers().size() );
Map configuration = ((ContinuumNotifier) project.getNotifiers().get( 0 )).getConfiguration();
@@ -123,6 +128,14 @@
" <address>" + getEmail() + "</address>\n" +
" </configuration>\n" +
" </notifier>\n" +
+ " <notifier>\n" +
+ " <type>irc</type>\n" +
+ " <configuration>\n" +
+ " <host>irc.codehaus.org</host>\n" +
+ " <port>6667</port>\n" +
+ " <channel>#plexus</channel>\n" +
+ " </configuration>\n" +
+ " </notifier>\n" +
" </notifiers>\n" +
" </ciManagement>\n" +
" <scm>\n" +
@@ -136,5 +149,19 @@
"class Foo { }" );
cvsImport( basedir, artifactId, getCvsRoot() );
+ }
+
+ private void removeNotifier( String projectId, String notifierType )
+ {
+ try
+ {
+ getContinuum().removeNotifier( projectId, notifierType );
+ }
+ catch( Exception e )
+ {
+ e.printStackTrace();
+
+ fail( "Unexpected exception after removing notifier '" + notifierType + "' for project '" + projectId );
+ }
}
}
Modified: maven/continuum/branches/trygvis-test/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/pom.xml?rev=225659&r1=225658&r2=225659&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/pom.xml Wed Jul 27 17:07:58 2005
@@ -38,7 +38,6 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
@@ -109,7 +108,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-4</version>
</dependency>
<!-- Plexus SCM -->
<dependency>
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=225659&r1=225658&r2=225659&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Wed Jul 27 17:07:58 2005
@@ -27,7 +27,6 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Developer;
import org.apache.maven.model.Notifier;
-import org.apache.maven.model.Repository;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -337,12 +336,10 @@
getLogger().warn( "Error while building Maven settings.", e );
}
- Repository repository = new Repository();
-
return artifactRepositoryFactory.createArtifactRepository( "local",
"file://" + localRepository,
repositoryLayout,
- repository.getSnapshotPolicy(),
- repository.getChecksumPolicy() );
+ null,
+ null );
}
}
Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml?rev=225659&r1=225658&r2=225659&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml Wed Jul 27 17:07:58 2005
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-4</version>
<scope>runtime</scope>
</dependency>
Modified: maven/continuum/branches/trygvis-test/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java?rev=225659&r1=225658&r2=225659&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java Wed Jul 27 17:07:58 2005
@@ -18,9 +18,9 @@
import java.util.List;
+import org.apache.maven.scm.manager.ScmManager;
import org.codehaus.plexus.formica.FormicaException;
import org.codehaus.plexus.formica.validation.AbstractValidator;
-import org.codehaus.plexus.scm.ScmManager;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=225659&r1=225658&r2=225659&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/META-INF/plexus/components.xml Wed Jul 27 17:07:58 2005
@@ -386,7 +386,7 @@
<implementation>org.apache.maven.continuum.web.validation.ScmUrlValidator</implementation>
<requirements>
<requirement>
- <role>org.codehaus.plexus.scm.ScmManager</role>
+ <role>org.apache.maven.scm.manager.ScmManager</role>
</requirement>
</requirements>
</component>
Modified: maven/continuum/branches/trygvis-test/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/pom.xml?rev=225659&r1=225658&r2=225659&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/pom.xml Wed Jul 27 17:07:58 2005
@@ -41,27 +41,27 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<!--
|
@@ -190,6 +190,22 @@
<url>scp://beaver.codehaus.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
</repository>
</distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>snapshots</id>
+ <name>Maven Central Development Repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>snapshots</id>
+ <name>Maven Central Plugins Development Repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2/plugins</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<pluginManagement>
<plugins>
@@ -197,6 +213,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plexus-plugin</artifactId>
<version>1.1-alpha-6-SNAPSHOT</version>
+ <extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>