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/07/28 15:36:40 UTC

svn commit: r680353 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml src/it/settings.xml

Author: bentmann
Date: Mon Jul 28 06:36:39 2008
New Revision: 680353

URL: http://svn.apache.org/viewvc?rev=680353&view=rev
Log:
o Resurrected Install Plugin to stage plugin into IT repo
o Reverted non-functional workaround for MINVOKER-43

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml

Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=680353&r1=680352&r2=680353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Mon Jul 28 06:36:39 2008
@@ -285,6 +285,33 @@
               </execution>
            </executions>
           </plugin>
+          <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-install-plugin</artifactId>
+            <version>2.2</version>
+            <executions>
+              <execution>
+                <id>it-preparation</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>
+                  <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
+                  <localRepositoryId>local</localRepositoryId>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml?rev=680353&r1=680352&r2=680353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml Mon Jul 28 06:36:39 2008
@@ -8,7 +8,7 @@
       </activation>      
       <repositories>
         <repository>
-          <id>it-repo</id>
+          <id>local.central</id>
           <url>file://@localRepository@</url>
           <releases>
             <enabled>true</enabled>
@@ -20,7 +20,7 @@
       </repositories>
       <pluginRepositories>
         <pluginRepository>
-          <id>it-repo</id>
+          <id>local.central</id>
           <url>file://@localRepository@</url>
           <releases>
             <enabled>true</enabled>