You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/05/30 17:30:52 UTC

svn commit: r780286 - in /maven/sandbox/trunk/plugins/maven-zip-plugin: pom.xml src/it/settings.xml

Author: olamy
Date: Sat May 30 15:30:51 2009
New Revision: 780286

URL: http://svn.apache.org/viewvc?rev=780286&view=rev
Log:
upgrade maven-invoker-plugin version

Added:
    maven/sandbox/trunk/plugins/maven-zip-plugin/src/it/settings.xml   (with props)
Modified:
    maven/sandbox/trunk/plugins/maven-zip-plugin/pom.xml

Modified: maven/sandbox/trunk/plugins/maven-zip-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-zip-plugin/pom.xml?rev=780286&r1=780285&r2=780286&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-zip-plugin/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-zip-plugin/pom.xml Sat May 30 15:30:51 2009
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>10</version>
+    <version>13</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-zip-plugin</artifactId>
@@ -105,7 +105,7 @@
 
   <profiles>
     <profile>
-      <id>integration-tests</id>
+      <id>run-its</id>
       <activation>
         <property>
           <name>skipTests</name>
@@ -116,50 +116,29 @@
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>${project.packaging}</packaging>
-                  <pomFile>${basedir}/pom.xml</pomFile>
-                  <createChecksum>true</createChecksum>
-                  <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                  <localRepositoryId>it-local-repo</localRepositoryId>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.1</version>
+            <version>1.3</version>
             <configuration>
+              <debug>true</debug>
               <projectsDirectory>src/it</projectsDirectory>
               <pomIncludes>
                 <pomInclude>**/**/pom.xml</pomInclude>
               </pomIncludes>
-              <postBuildHookScript>verify.bsh</postBuildHookScript>
+              <postBuildHookScript>verify</postBuildHookScript>
               <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
               <goals>
                 <goal>clean</goal>
                 <goal>package</goal>
               </goals>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>              
             </configuration>
             <executions>
               <execution>
                 <id>integration-test</id>
                 <phase>integration-test</phase>
                 <goals>
+                  <goal>install</goal>
                   <goal>run</goal>
                 </goals>
               </execution>

Added: maven/sandbox/trunk/plugins/maven-zip-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-zip-plugin/src/it/settings.xml?rev=780286&view=auto
==============================================================================
--- maven/sandbox/trunk/plugins/maven-zip-plugin/src/it/settings.xml (added)
+++ maven/sandbox/trunk/plugins/maven-zip-plugin/src/it/settings.xml Sat May 30 15:30:51 2009
@@ -0,0 +1,66 @@
+<?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.
+-->
+
+<settings>
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+        <repository>
+          <id>codehaus.snapshots</id>
+          <name>Codehaus Snapshot Repository</name>
+          <url>http://snapshots.repository.codehaus.org/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</settings>

Propchange: maven/sandbox/trunk/plugins/maven-zip-plugin/src/it/settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/plugins/maven-zip-plugin/src/it/settings.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision