Author: bentmann
Date: Fri Mar 20 21:31:55 2009
New Revision: 756764
URL: http://svn.apache.org/viewvc?rev=756764&view=rev
Log:
[MINSTALL-35] Possibility to install an artefact on a given repository directory
o Added IT
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/invoker.properties
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/pom.xml
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/setup.bsh
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.jar
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.properties
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/invoker.properties
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/invoker.properties
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-2/invoker.properties
maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/invoker.properties
maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/invoker.properties
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/invoker.properties?rev=756764&r1=756763&r2=756764&view=diff
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/invoker.properties
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/invoker.properties
Fri Mar 20 21:31:55 2009
@@ -1,2 +1,2 @@
-invoker.goals = org.apache.maven.plugins:maven-install-plugin:install-file
+invoker.goals =
org.apache.maven.plugins:maven-install-plugin:${project.version}:install-file
invoker.buildResult = failure
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/invoker.properties?rev=756764&r1=756763&r2=756764&view=diff
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/invoker.properties
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/invoker.properties
Fri Mar 20 21:31:55 2009
@@ -1 +1 @@
-invoker.goals = install:install-file
+invoker.goals =
org.apache.maven.plugins:maven-install-plugin:${project.version}:install-file
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-2/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-2/invoker.properties?rev=756764&r1=756763&r2=756764&view=diff
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-2/invoker.properties
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-2/invoker.properties
Fri Mar 20 21:31:55 2009
@@ -1 +1 @@
-invoker.goals = install:install-file
+invoker.goals =
org.apache.maven.plugins:maven-install-plugin:${project.version}:install-file
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/invoker.properties?rev=756764&r1=756763&r2=756764&view=diff
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/invoker.properties
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/invoker.properties
Fri Mar 20 21:31:55 2009
@@ -1 +1 @@
-invoker.goals = install:install-file
+invoker.goals =
org.apache.maven.plugins:maven-install-plugin:${project.version}:install-file
Propchange: maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Fri Mar 20 21:31:55 2009
@@ -0,0 +1 @@
+MINSTALL-\d+
Propchange: maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/invoker.properties?rev=756764&view=auto
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/invoker.properties
(added)
+++
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/invoker.properties
Fri Mar 20 21:31:55 2009
@@ -0,0 +1 @@
+invoker.goals =
org.apache.maven.plugins:maven-install-plugin:${project.version}:install-file
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/pom.xml?rev=756764&view=auto
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/pom.xml
(added)
+++ maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/pom.xml
Fri Mar 20 21:31:55 2009
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.install.lro</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <description>
+ Tests the manual installation into a different local repo than the one
configured in the settings
+ (MINSTALL-35).
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/setup.bsh?rev=756764&view=auto
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/setup.bsh
(added)
+++
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/setup.bsh
Fri Mar 20 21:31:55 2009
@@ -0,0 +1,10 @@
+import java.io.*;
+import java.util.*;
+
+import org.codehaus.plexus.util.*;
+
+File file = new File( basedir, "target" );
+System.out.println( "Deleting " + file );
+FileUtils.deleteDirectory( file );
+
+return true;
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/setup.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/setup.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.jar?rev=756764&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.properties?rev=756764&view=auto
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.properties
(added)
+++
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.properties
Fri Mar 20 21:31:55 2009
@@ -0,0 +1,6 @@
+file = test.jar
+groupId = gid
+artifactId = test
+version = 0.1
+packaging = jar
+localRepositoryPath = target/local-repo
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/test.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/verify.bsh?rev=756764&view=auto
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/verify.bsh
(added)
+++
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/verify.bsh
Fri Mar 20 21:31:55 2009
@@ -0,0 +1,19 @@
+import java.io.*;
+import java.util.*;
+
+String[] paths =
+{
+ "gid/test/0.1/test-0.1.jar",
+};
+
+for ( String path : paths )
+{
+ File file = new File( new File( basedir, "target/local-repo" ), path );
+ System.out.println( "Checking for existence of " + file );
+ if ( !file.isFile() )
+ {
+ throw new FileNotFoundException( "Existing: " + file.getAbsolutePath()
);
+ }
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/invoker.properties?rev=756764&r1=756763&r2=756764&view=diff
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/invoker.properties
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/invoker.properties
Fri Mar 20 21:31:55 2009
@@ -1 +1 @@
-invoker.goals = install:install-file
+invoker.goals =
org.apache.maven.plugins:maven-install-plugin:${project.version}:install-file
