svn commit: r1065954 - in /maven/release/trunk: ./ maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/
Author: olamy
Date: Tue Feb 1 09:19:37 2011
New Revision: 1065954
URL: http://svn.apache.org/viewvc?rev=1065954view=rev
Log:
[MRELEASE-641] upgrade to scm 1.5 (hg plugin insists on 'pushing')
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
maven/release/trunk/pom.xml
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java?rev=1065954r1=1065953r2=1065954view=diff
==
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
Tue Feb 1 09:19:37 2011
@@ -28,7 +28,9 @@ import java.util.List;
import org.apache.maven.Maven;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.manager.ScmManagerStub;
@@ -124,9 +126,15 @@ public class GenerateReleasePomsPhaseTes
Constraint[] arguments = new Constraint[] { new IsAnything(), new
IsScmFileSetEquals( fileSet ) };
-scmProviderMock.expects( new InvokeOnceMatcher() ).method( add
).with( arguments ).will(
-new ReturnStub( new AddScmResult( ...,
Collections.singletonList( Maven.RELEASE_POMv4 ) ) ) );
+scmProviderMock
+.expects( new InvokeOnceMatcher() )
+.method( add )
+.with( arguments )
+.will( new ReturnStub( new AddScmResult( ..., Collections
+ .singletonList( new ScmFile( Maven.RELEASE_POMv4,
ScmFileStatus.ADDED ) ) ) ) );
+
+
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java?rev=1065954r1=1065953r2=1065954view=diff
==
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
Tue Feb 1 09:19:37 2011
@@ -21,7 +21,9 @@ package org.apache.maven.shared.release.
import org.apache.maven.Maven;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.manager.ScmManagerStub;
@@ -70,9 +72,15 @@ public class RemoveReleasePomsPhaseTest
Mock scmProviderMock = new Mock( ScmProvider.class );
Constraint[] arguments = new Constraint[] { new IsAnything(), new
IsScmFileSetEquals( fileSet ), new IsAnything() };
-scmProviderMock.expects( new InvokeOnceMatcher() ).method( remove
).with( arguments ).will(
-new ReturnStub( new RemoveScmResult( ...,
Collections.singletonList( Maven.RELEASE_POMv4 ) ) ) );
+scmProviderMock
+.expects( new InvokeOnceMatcher() )
+.method( remove )
+.with( arguments )
+.will( new ReturnStub( new RemoveScmResult( ..., Collections
+ .singletonList( new ScmFile( Maven.RELEASE_POMv4,
ScmFileStatus.DELETED ) ) ) ) );
+
+
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
@@ -99,8 +107,12
svn commit: r1065957 - /maven/release/trunk/maven-release-manager/pom.xml
Author: olamy Date: Tue Feb 1 09:36:32 2011 New Revision: 1065957 URL: http://svn.apache.org/viewvc?rev=1065957view=rev Log: use last modello plugin version and set useJava5 - true Modified: maven/release/trunk/maven-release-manager/pom.xml Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1065957r1=1065956r2=1065957view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Tue Feb 1 09:36:32 2011 @@ -228,7 +228,7 @@ plugin groupIdorg.codehaus.modello/groupId artifactIdmodello-maven-plugin/artifactId -version1.1/version +version1.4.1/version executions execution goals @@ -241,6 +241,7 @@ configuration version2.2.0/version packageWithVersionfalse/packageWithVersion + useJava5true/useJava5 models modelsrc/main/mdo/release-descriptor.mdo/model /models
svn commit: r1065973 - /maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: ltheussl
Date: Tue Feb 1 10:06:02 2011
New Revision: 1065973
URL: http://svn.apache.org/viewvc?rev=1065973view=rev
Log:
add a note about MSITE-159
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1065973r1=1065972r2=1065973view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Tue Feb 1 10:06:02 2011
@@ -495,6 +495,7 @@ public class DefaultSiteTool
decorationModel.setBannerLeft( banner );
}
+/* TODO: MSITE-159: make this configurable? */
if ( project.getUrl() != null )
{
assembler.resolvePaths( decorationModel, project.getUrl() );
svn commit: r1065976 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Author: olamy Date: Tue Feb 1 10:07:03 2011 New Revision: 1065976 URL: http://svn.apache.org/viewvc?rev=1065976view=rev Log: remove unused immport Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1065976r1=1065975r2=1065976view=diff == --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Tue Feb 1 10:07:03 2011 @@ -19,6 +19,9 @@ package org.apache.maven.shared.release. * under the License. */ +import java.util.Iterator; +import java.util.List; + import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.release.ReleaseExecutionException; @@ -32,10 +35,6 @@ import org.apache.maven.shared.release.v import org.codehaus.plexus.components.interactivity.Prompter; import org.codehaus.plexus.components.interactivity.PrompterException; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * Map projects to their new versions after release / into the next development cycle. *
svn commit: r1065981 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
Author: olamy Date: Tue Feb 1 10:15:30 2011 New Revision: 1065981 URL: http://svn.apache.org/viewvc?rev=1065981view=rev Log: remove unused immport Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java?rev=1065981r1=1065980r2=1065981view=diff == --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java Tue Feb 1 10:15:30 2011 @@ -19,6 +19,9 @@ package org.apache.maven.shared.release. * under the License. */ +import java.io.File; +import java.io.IOException; + import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; @@ -28,11 +31,6 @@ import org.codehaus.plexus.util.ReaderFa import org.codehaus.plexus.util.xml.XmlStreamReader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; - /**
svn commit: r1065999 - /maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
Author: olamy Date: Tue Feb 1 11:20:44 2011 New Revision: 1065999 URL: http://svn.apache.org/viewvc?rev=1065999view=rev Log: remove unused import Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java?rev=1065999r1=1065998r2=1065999view=diff == --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java Tue Feb 1 11:20:44 2011 @@ -19,7 +19,8 @@ package org.apache.maven.plugins.release * under the License. */ -import org.apache.commons.lang.StringUtils; +import java.util.Arrays; + import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.shared.release.ReleaseExecutionException; @@ -27,8 +28,6 @@ import org.apache.maven.shared.release.R import org.apache.maven.shared.release.config.ReleaseDescriptor; import org.apache.maven.shared.release.config.ReleaseUtils; -import java.util.Arrays; - /** * Branch a project in SCM, using the same steps as the ttrelease:prepare/tt goal, creating a branch instead of a tag. * For more info see a href=http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html;http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html/a.
svn commit: r1066014 [4/4] - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/ maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ mav
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java?rev=1066014r1=1066013r2=1066014view=diff
==
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
Tue Feb 1 11:55:50 2011
@@ -66,8 +66,6 @@ public class ScmCommitPreparationPhaseTe
{
private static final String PREFIX = [maven-release-manager] prepare
release ;
-private static final File[] EMPTY_FILE_ARRAY = new File[0];
-
protected void setUp()
throws Exception
{
@@ -90,7 +88,7 @@ public class ScmCommitPreparationPhaseTe
public void testCommit()
throws Exception
{
-List reactorProjects = createReactorProjects();
+ListMavenProject reactorProjects = createReactorProjects();
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setScmSourceUrl( scm-url );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
@@ -123,20 +121,19 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
-List reactorProjects = createReactorProjects( scm-commit/,
multiple-poms );
+ListMavenProject reactorProjects = createReactorProjects(
scm-commit/, multiple-poms );
descriptor.setScmSourceUrl( scm-url );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory(
rootProject.getFile().getParentFile().getAbsolutePath() );
descriptor.setScmReleaseLabel( release-label );
-List poms = new ArrayList();
-for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ListFile poms = new ArrayListFile();
+for ( IteratorMavenProject i = reactorProjects.iterator();
i.hasNext(); )
{
-MavenProject project = (MavenProject) i.next();
+MavenProject project = i.next();
poms.add( project.getFile() );
}
-ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile(), (File[]) poms.toArray(
-EMPTY_FILE_ARRAY ) );
+ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile(), poms);
Mock scmProviderMock = new Mock( ScmProvider.class );
Constraint[] arguments = new Constraint[]{new IsAnything(), new
IsScmFileSetEquals( fileSet ), new IsNull(),
@@ -162,7 +159,7 @@ public class ScmCommitPreparationPhaseTe
phase = (ReleasePhase) lookup( ReleasePhase.ROLE,
scm-commit-development );
ReleaseDescriptor descriptor = new ReleaseDescriptor();
-List reactorProjects = createReactorProjects();
+ListMavenProject reactorProjects = createReactorProjects();
descriptor.setScmSourceUrl( scm-url );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory(
rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -192,7 +189,7 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
-List reactorProjects = createReactorProjects();
+ListMavenProject reactorProjects = createReactorProjects();
try
{
@@ -208,7 +205,7 @@ public class ScmCommitPreparationPhaseTe
public void testCommitGenerateReleasePoms()
throws Exception
{
-List reactorProjects = createReactorProjects();
+ListMavenProject reactorProjects = createReactorProjects();
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setScmSourceUrl( scm-url );
descriptor.setGenerateReleasePoms( true );
@@ -216,7 +213,7 @@ public class ScmCommitPreparationPhaseTe
descriptor.setWorkingDirectory(
rootProject.getFile().getParentFile().getAbsolutePath() );
descriptor.setScmReleaseLabel( release-label );
-List files = new ArrayList();
+ListFile files = new ArrayListFile();
files.add( rootProject.getFile() );
files.add( ReleaseUtil.getReleasePom( rootProject ) );
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile(), files );
@@ -243,7 +240,7 @@ public class ScmCommitPreparationPhaseTe
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
-List reactorProjects = createReactorProjects();
+ListMavenProject
svn commit: r1066020 - /maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
Author: olamy
Date: Tue Feb 1 12:04:41 2011
New Revision: 1066020
URL: http://svn.apache.org/viewvc?rev=1066020view=rev
Log:
more details if assert failed
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java?rev=1066020r1=1066019r2=1066020view=diff
==
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
Tue Feb 1 12:04:41 2011
@@ -53,7 +53,7 @@ public class PomFinderTest extends Plexu
File pomFile = new File( pomUrl.getFile() );
found = pf.parsePom( pomFile );
-assertTrue( found );
+assertTrue(pomFile not found pomUrl + pomUrl + , pomFile +
pomFile.getPath() , found );
{
File foundPom = pf.findMatchingPom( pomFile.getParentFile() );
svn commit: r1066038 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site: AbstractSiteMojo.java AbstractSiteRenderingMojo.java SiteDeployMojo.java SiteStageDeployMo
Author: ltheussl
Date: Tue Feb 1 13:00:59 2011
New Revision: 1066038
URL: http://svn.apache.org/viewvc?rev=1066038view=rev
Log:
make SiteDeployMojo extend AbstractSiteMojo. this makes project parameters like
locales, reactorProjects, etc available in the deploy and stage mojos, which
will be needed for fixing MSITE-322, MSITE-537
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1066038r1=1066037r2=1066038view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Tue Feb 1 13:00:59 2011
@@ -20,19 +20,14 @@ package org.apache.maven.plugins.site;
*/
import java.io.File;
-import java.util.Iterator;
+
import java.util.List;
-import java.util.Locale;
-import java.util.Map;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.Menu;
-import org.apache.maven.doxia.site.decoration.MenuItem;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.MavenReport;
+
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.ReaderFactory;
@@ -133,50 +128,6 @@ public abstract class AbstractSiteMojo
return ( outputEncoding == null ) ? ReaderFactory.UTF_8 :
outputEncoding;
}
-protected void populateReportItems( DecorationModel decorationModel,
Locale locale,
-MapString, MavenReport
reportsByOutputName )
-{
-for ( IteratorMenu i = decorationModel.getMenus().iterator();
i.hasNext(); )
-{
-Menu menu = i.next();
-
-populateItemRefs( menu.getItems(), locale, reportsByOutputName );
-}
-}
-
-private void populateItemRefs( ListMenuItem items, Locale locale,
MapString, MavenReport reportsByOutputName )
-{
-for ( IteratorMenuItem i = items.iterator(); i.hasNext(); )
-{
-MenuItem item = i.next();
-
-if ( item.getRef() != null )
-{
-MavenReport report = reportsByOutputName.get( item.getRef() );
-
-if ( report != null )
-{
-
-if ( item.getName() == null )
-{
-item.setName( report.getName( locale ) );
-}
-
-if ( item.getHref() == null || item.getHref().length() ==
0 )
-{
-item.setHref( report.getOutputName() + .html );
-}
-}
-else
-{
-getLog().warn( Unrecognised reference: ' + item.getRef()
+ ' );
-i.remove();
-}
-}
-populateItemRefs( item.getItems(), locale, reportsByOutputName );
-}
-}
-
/**
* TODO should be removed see PLXUTILS-61
*
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1066038r1=1066037r2=1066038view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Tue Feb 1 13:00:59 2011
@@ -19,11 +19,24 @@ package org.apache.maven.plugins.site;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
svn commit: r1066045 - in /maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase: IsScmFileSetEquals.java RunCompleteGoalsPhaseTest.java RunPerformGoalsPhaseTes
Author: olamy
Date: Tue Feb 1 13:48:03 2011
New Revision: 1066045
URL: http://svn.apache.org/viewvc?rev=1066045view=rev
Log:
some cosmetic cleanup (remove some deprecated use)
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java?rev=1066045r1=1066044r2=1066045view=diff
==
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
Tue Feb 1 13:48:03 2011
@@ -19,8 +19,6 @@ package org.apache.maven.shared.release.
* under the License.
*/
-import java.util.Arrays;
-
import org.apache.maven.scm.ScmFileSet;
import org.jmock.core.Constraint;
@@ -45,7 +43,7 @@ public class IsScmFileSetEquals
ScmFileSet fs = (ScmFileSet) object;
return fs.getBasedir().equals( fileSet.getBasedir() )
-Arrays.asList( fs.getFiles() ).equals( Arrays.asList(
fileSet.getFiles() ) );
+ fs.getFileList().equals( fileSet.getFileList() );
}
public StringBuffer describeTo( StringBuffer stringBuffer )
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java?rev=1066045r1=1066044r2=1066045view=diff
==
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
Tue Feb 1 13:48:03 2011
@@ -22,11 +22,13 @@ package org.apache.maven.shared.release.
import java.io.File;
import java.util.List;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.exec.MavenExecutorException;
import org.codehaus.plexus.PlexusTestCase;
@@ -72,9 +74,9 @@ public class RunCompleteGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( executeGoals ).with(
constraints );
-phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
-phase.execute( config, (Settings) null, (List) null );
+phase.execute( config, (Settings) null, (ListMavenProject) null );
// just needs to survive the mock
assertTrue( true );
@@ -94,7 +96,7 @@ public class RunCompleteGoalsPhaseTest
new IsAnything(), new IsEqual( Boolean.TRUE ), new IsAnything(),
new IsAnything()};
mock.expects( new InvokeOnceMatcher() ).method( executeGoals ).with(
constraints );
-phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
phase.simulate( config, new DefaultReleaseEnvironment(), null );
@@ -117,11 +119,11 @@ public class RunCompleteGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( executeGoals ).with(
constraints ).will(
new ThrowStub( new MavenExecutorException( ..., new Exception()
) ) );
-phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
try
{
-phase.execute( config, (Settings) null, (List) null );
+phase.execute( config,
svn commit: r1066064 - /maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Author: krosenvold Date: Tue Feb 1 15:29:32 2011 New Revision: 1066064 URL: http://svn.apache.org/viewvc?rev=1066064view=rev Log: [MNG-4996] Made scope and version volatile on artifact Resisted the urge to make *everything* threadsafe on this class, which I will happily admit has been there for a long time. Modified: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Modified: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=1066064r1=1066063r2=1066064view=diff == --- maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original) +++ maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Tue Feb 1 15:29:32 2011 @@ -53,7 +53,7 @@ public class DefaultArtifact private final String classifier; -private String scope; +private volatile String scope; private volatile File file; @@ -67,7 +67,7 @@ public class DefaultArtifact private ListString dependencyTrail; -private String version; +private volatile String version; private VersionRange versionRange;
svn commit: r1066323 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java test/java/org/apache/maven/plugin/d
Author: brianf
Date: Wed Feb 2 04:05:27 2011
New Revision: 1066323
URL: http://svn.apache.org/viewvc?rev=1066323view=rev
Log:
MDEP-225 applied patch to touch marker file timestamps if they already exist.
Patch from Phillip Hellewell
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java?rev=1066323r1=1066322r2=1066323view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
Wed Feb 2 04:05:27 2011
@@ -113,7 +113,25 @@ public class DefaultFileMarkerHandler
{
throw new MojoExecutionException( Unable to create Marker: +
marker.getAbsolutePath(), e );
}
-
+
+// update marker file timestamp
+try
+{
+long ts;
+if ( this.artifact != null this.artifact.getFile() != null )
+{
+ts = this.artifact.getFile().lastModified();
+}
+else
+{
+ts = System.currentTimeMillis();
+}
+marker.setLastModified( ts );
+}
+catch ( Exception e )
+{
+throw new MojoExecutionException( Unable to update Marker
timestamp: + marker.getAbsolutePath(), e );
+}
}
/**
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java?rev=1066323r1=1066322r2=1066323view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
Wed Feb 2 04:05:27 2011
@@ -123,19 +123,27 @@ public class TestMarkerFileFilter
public void testMarkerTimestamp()
throws IOException, MojoExecutionException, ArtifactFilterException
{
+// filter includes release artifact because no marker present
+// filter includes snapshot artifact becaues it is newer than marker
DependencyArtifactStubFactory fileFact = new
DependencyArtifactStubFactory( outputFolder, true );
Artifact snap = fileFact.getSnapshotArtifact();
Artifact release = fileFact.getReleaseArtifact();
HashSet tempArtifacts = new HashSet();
tempArtifacts.add( snap );
tempArtifacts.add( release );
-snap.getFile().setLastModified( snap.getFile().lastModified() + 1500 );
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( snap,
outputFolder );
handler.setMarker();
+snap.getFile().setLastModified( snap.getFile().lastModified() + 1500 );
MarkerFileFilter filter = new MarkerFileFilter( false, false, true,
new DefaultFileMarkerHandler( outputFolder ) );
Set result = filter.filter( tempArtifacts);
assertEquals( 2, result.size() );
+// update marker; filter won't include snapshot because timestamps
equal
+handler.setMarker();
+result = filter.filter( tempArtifacts );
+assertEquals( 1, result.size() );
+
+// filter won't include snapshot because it is older than marker
snap.getFile().setLastModified( snap.getFile().lastModified() - 1
);
result = filter.filter( tempArtifacts );
