You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/11/04 21:54:44 UTC
svn commit: r711399 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
resources/mng-3415/maven-find-local-repo-plugin/pom.xml
resources/mng-3415/project/pom.xml
Author: bentmann
Date: Tue Nov 4 12:54:44 2008
New Revision: 711399
URL: http://svn.apache.org/viewvc?rev=711399&view=rev
Log:
o Moved a couple of artifacts into groupId org.apache.maven.its.<issue>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/maven-find-local-repo-plugin/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/project/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java?rev=711399&r1=711398&r2=711399&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java Tue Nov 4 12:54:44 2008
@@ -194,7 +194,7 @@
File firstLogFile = new File( projectDir, verifier.getLogFileName() );
// FIXME: There really should be a better way than this!
- assertOutputLinePresent( verifier, firstLogFile, "snapshot tests:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
+ assertOutputLinePresent( verifier, firstLogFile, "snapshot org.apache.maven.its.mng3415:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
File updateCheckFile = getUpdateCheckFile( localRepo );
long firstLastMod = updateCheckFile.lastModified();
@@ -210,7 +210,7 @@
File secondLogFile = new File( projectDir, verifier.getLogFileName() );
// FIXME: There really should be a better way than this!
- assertOutputLineMissing( verifier, secondLogFile, "snapshot tests:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
+ assertOutputLineMissing( verifier, secondLogFile, "snapshot org.apache.maven.its.mng3415:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
assertEquals( "Last-modified time should be unchanged from first build through second build for the file we use for updateInterval checks.", firstLastMod, updateCheckFile.lastModified() );
}
@@ -264,7 +264,7 @@
private File getMetadataFile( File localRepo )
{
- File dir = new File( localRepo, "tests/missing/1.0-SNAPSHOT" );
+ File dir = new File( localRepo, "org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT" );
dir.mkdirs();
@@ -277,7 +277,7 @@
*/
private File getUpdateCheckFile( File localRepo )
{
- File dir = new File( localRepo, "tests/missing/1.0-SNAPSHOT" );
+ File dir = new File( localRepo, "org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT" );
dir.mkdirs();
@@ -301,14 +301,14 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins", "maven-find-local-repo-plugin", "1.0-SNAPSHOT", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-find-local-repo-plugin", "1.0-SNAPSHOT", "jar" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.executeGoal( "find-local-repo:find" );
+ verifier.executeGoal( "org.apache.maven.its.plugins:maven-find-local-repo-plugin:1.0-SNAPSHOT:find" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/maven-find-local-repo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/maven-find-local-repo-plugin/pom.xml?rev=711399&r1=711398&r2=711399&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/maven-find-local-repo-plugin/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/maven-find-local-repo-plugin/pom.xml Tue Nov 4 12:54:44 2008
@@ -1,11 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-find-local-repo-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.0-SNAPSHOT</version>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/project/pom.xml?rev=711399&r1=711398&r2=711399&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/project/pom.xml Tue Nov 4 12:54:44 2008
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>tests</groupId>
+ <groupId>org.apache.maven.its.mng3415</groupId>
<artifactId>project</artifactId>
<version>1</version>
<dependencies>
<dependency>
- <groupId>tests</groupId>
+ <groupId>org.apache.maven.its.mng3415</groupId>
<artifactId>missing</artifactId>
<version>1.0-SNAPSHOT</version>
<type>pom</type>