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 2010/04/30 12:47:17 UTC
svn commit: r939628 - in
/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts:
pom.xml src/ verify.bsh
Author: bentmann
Date: Fri Apr 30 10:47:16 2010
New Revision: 939628
URL: http://svn.apache.org/viewvc?rev=939628&view=rev
Log:
o Polished IT
Removed:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml?rev=939628&r1=939627&r2=939628&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml Fri Apr 30 10:47:16 2010
@@ -1,21 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the
- Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<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.invoker</groupId>
- <artifactId>local-repo-isolated</artifactId>
+ <artifactId>stage-extras</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
- Test to check for usage of an isolated local repository.
+ Test to check for staging of external dependencies directly from local repository (MINVOKER-102).
</description>
<properties>
@@ -30,13 +43,12 @@
<version>@pom.version@</version>
<configuration>
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <settingsFile>src/it/settings.xml</settingsFile>
<extraArtifacts>
- <extraArtifact>asm:asm:3.0</extraArtifact>
+ <!-- gid:aid:version -->
+ <extraArtifact>junit:junit:3.8.2</extraArtifact>
+ <!-- gid:aid:version:type -->
<extraArtifact>org.apache.maven.plugins:maven-clean-plugin:2.4:maven-plugin</extraArtifact>
+ <!-- gid:aid:version:type:classifier -->
<extraArtifact>org.apache.maven.plugins:maven-clean-plugin:2.4:jar:javadoc</extraArtifact>
</extraArtifacts>
</configuration>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh?rev=939628&r1=939627&r2=939628&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh Fri Apr 30 10:47:16 2010
@@ -11,39 +11,27 @@ try
return false;
}
- File installedFile = new File( itRepoDir, "org/apache/maven/plugins/maven-clean-plugin/2.4/maven-clean-plugin-2.4.pom" );
- if ( !installedFile.isFile() )
+ String[] files =
{
- System.out.println( "Installed file missing in local repo: " + installedFile );
- return false;
- }
-
- installedFile = new File( itRepoDir, "org/apache/maven/plugins/maven-clean-plugin/2.4/maven-clean-plugin-2.4.jar" );
- if ( !installedFile.isFile() )
+ "org/apache/maven/plugins/maven-clean-plugin/2.4/maven-clean-plugin-2.4.jar",
+ "org/apache/maven/plugins/maven-clean-plugin/2.4/maven-clean-plugin-2.4.pom",
+ "org/apache/maven/plugins/maven-clean-plugin/2.4/maven-clean-plugin-2.4-javadoc.jar",
+ "org/apache/maven/plugins/maven-plugins/16/maven-plugins-16.pom",
+ "org/apache/maven/maven-parent/15/maven-parent-15.pom",
+ "org/apache/apache/6/apache-6.pom",
+ "org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar",
+ "org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom",
+ "junit/junit/3.8.2/junit-3.8.2.jar",
+ "junit/junit/3.8.2/junit-3.8.2.pom",
+ };
+ for ( String file : files )
{
- System.out.println( "Installed file missing in local repo: " + installedFile );
- return false;
- }
-
- installedFile = new File( itRepoDir, "org/apache/maven/plugins/maven-clean-plugin/2.4/maven-clean-plugin-2.4-javadoc.jar" );
- if ( !installedFile.isFile() )
- {
- System.out.println( "Installed file missing in local repo: " + installedFile );
- return false;
- }
-
- installedFile = new File( itRepoDir, "asm/asm/3.0/asm-3.0.jar" );
- if ( !installedFile.isFile() )
- {
- System.out.println( "Installed file missing in local repo: " + installedFile );
- return false;
- }
-
- installedFile = new File( itRepoDir, "asm/asm/3.0/asm-3.0.pom" );
- if ( !installedFile.isFile() )
- {
- System.out.println( "Installed file missing in local repo: " + installedFile );
- return false;
+ File stagedFile = new File( itRepoDir, file );
+ System.out.println( "Checking for existence of: " + stagedFile );
+ if ( !stagedFile.isFile() )
+ {
+ throw new IllegalStateException( "Missing: " + stagedFile );
+ }
}
}
catch( Throwable t )