Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 3145 invoked from network); 9 Apr 2009 03:46:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Apr 2009 03:46:46 -0000 Received: (qmail 40607 invoked by uid 500); 9 Apr 2009 03:46:46 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 40499 invoked by uid 500); 9 Apr 2009 03:46:45 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 40490 invoked by uid 99); 9 Apr 2009 03:46:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2009 03:46:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2009 03:46:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C550323889E9; Thu, 9 Apr 2009 03:46:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r763503 - in /maven/mercury/trunk: mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ Date: Thu, 09 Apr 2009 03:46:24 -0000 To: commits@maven.apache.org From: ogusakov@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090409034624.C550323889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ogusakov Date: Thu Apr 9 03:46:24 2009 New Revision: 763503 URL: http://svn.apache.org/viewvc?rev=763503&view=rev Log: [MERCURY-112,MERCURY-113,MERCURY-115] added a delay for test writes, added "always SNAPSHOT" flag to the local M2 repo Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java?rev=763503&r1=763502&r2=763503&view=diff ============================================================================== --- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java (original) +++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java Thu Apr 9 03:46:24 2009 @@ -218,6 +218,7 @@ count--; } } + Thread.sleep( 1000L ); // [MERCURY-112] ? } public List readArtifact( String name , List repos ) Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=763503&r1=763502&r2=763503&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Thu Apr 9 03:46:24 2009 @@ -66,6 +66,11 @@ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( LocalRepositoryReaderM2.class ); private static final Language LANG = new DefaultLanguage( LocalRepositoryReaderM2.class ); + + /** indicates that if a-1.0-SNAPSHOT.jar exists, it wins despite any timestamps + * required for Maven comatibility + **/ + private boolean _snapshotAlwaysWins = false; // --------------------------------------------------------------------------------------------------------------- private static final String[] _protocols = new String[] { "file" }; @@ -103,7 +108,7 @@ } // --------------------------------------------------------------------------------------------------------------- - private static ArtifactLocation calculateLocation( String root, ArtifactMetadata bmd, AbstractRepOpResult res ) + private ArtifactLocation calculateLocation( String root, ArtifactMetadata bmd, AbstractRepOpResult res ) { ArtifactLocation loc = new ArtifactLocation( root, bmd ); @@ -176,6 +181,7 @@ // gavDir.getAbsolutePath() ) ) ); if( LOG.isDebugEnabled() ) LOG.debug( LANG.getMessage( "gavdir.not.found", bmd.toString(), gavDir.getAbsolutePath() ) ); + return null; } @@ -411,7 +417,7 @@ } // --------------------------------------------------------------------------------------------------------------- - private static boolean findLatestSnapshot( final ArtifactMetadata md, final ArtifactLocation loc, AbstractRepOpResult res ) + private boolean findLatestSnapshot( final ArtifactMetadata md, final ArtifactLocation loc, AbstractRepOpResult res ) { File snapshotFile = new File( loc.getAbsPath() ); @@ -451,6 +457,9 @@ return true; } + if( _snapshotAlwaysWins ) + return false; + // otherwise - only add it if older'n the SNAPSHOT long fLM = new File( dir, name ).lastModified(); @@ -675,4 +684,11 @@ { } // --------------------------------------------------------------------------------------------------------------- + + public void setSnapshotAlwaysWins( boolean alwaysWins ) + { + _snapshotAlwaysWins = alwaysWins; + } + + }