Author: sisbell
Date: Mon Sep 8 15:15:39 2008
New Revision: 693298
URL: http://svn.apache.org/viewvc?rev=693298&view=rev
Log:
Merged trunk to branch.
Added:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/monitor/event/AbstractWorkspaceMonitor.java
- copied unchanged from r693297,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/AbstractWorkspaceMonitor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/monitor/event/MavenWorkspaceMonitor.java
- copied unchanged from r693297,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/MavenWorkspaceMonitor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java
- copied unchanged from r693297,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/monitor/event/PerCallWorkspaceMonitor.java
- copied unchanged from r693297,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/PerCallWorkspaceMonitor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderEventingTest.java
- copied unchanged from r693297,
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderEventingTest.java
Modified:
maven/components/branches/sisbell-maven-2.1-profile/ (props changed)
Propchange: maven/components/branches/sisbell-maven-2.1-profile/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 8 15:15:39 2008
@@ -1 +1,2 @@
+/maven/components/branches/maven-2.0.10-RC:680477
/maven/components/branches/maven-2.0.x:679206
