svn commit: r817837 - in /maven/plugins/branches/maven-site-plugin-3.x/src: it/ it/full-reporting/ main/java/org/apache/maven/plugins/site/

[ol...@apache.org]

Author: olamy
Date: Tue Sep 22 20:50:58 2009
New Revision: 817837

URL: http://svn.apache.org/viewvc?rev=817837&view=rev
Log:
use repositories from the project.

Added:
    maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/invoker.properties
      - copied, changed from r815938, maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/profiles.txt
Removed:
    maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/profiles.txt
Modified:
    maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java

Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/invoker.properties (from r815938, maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/profiles.txt)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/invoker.properties?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/invoker.properties&p1=maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/profiles.txt&r1=815938&r2=817837&rev=817837&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/profiles.txt (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/invoker.properties Tue Sep 22 20:50:58 2009
@@ -1 +1 @@
-reporting
\ No newline at end of file
+invoker.profiles=reporting
\ No newline at end of file

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml?rev=817837&r1=817836&r2=817837&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml Tue Sep 22 20:50:58 2009
@@ -64,18 +64,5 @@
           
     </plugins>
   </reporting>
-  <profiles>
-    <profile>
-      <id>foo</id>
-      <reporting>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>${javadocPluginVersion}</version>          
-          </plugin>         
-        </plugins>
-      </reporting>
-    </profile>
-  </profiles>
+
 </project>

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml?rev=817837&r1=817836&r2=817837&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml Tue Sep 22 20:50:58 2009
@@ -40,7 +40,7 @@
         <repository>
           <id>apache.snapshots</id>
           <name>Apache Snapshot Repository</name>
-          <url>http://repository.apache.org/snapshots/</url>
+          <url>http://repository.apache.org/content/groups/snapshots-group/</url>
           <releases>
             <enabled>false</enabled>
           </releases>
@@ -63,7 +63,7 @@
         <pluginRepository>
           <id>apache.snapshots</id>
           <name>Apache Snapshot Repository</name>
-          <url>http://repository.apache.org/snapshots/</url>
+          <url>http://repository.apache.org/content/groups/snapshots-group/</url>
           <releases>
             <enabled>false</enabled>
           </releases>

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=817837&r1=817836&r2=817837&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java Tue Sep 22 20:50:58 2009
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
 import org.apache.maven.artifact.repository.RepositoryRequest;
 import org.apache.maven.lifecycle.LifecycleExecutor;
@@ -78,7 +79,12 @@
 
         RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
         repositoryRequest.setLocalRepository( mavenReportExecutorRequest.getLocalRepository() );
-        repositoryRequest.setRemoteRepositories( mavenReportExecutorRequest.getMavenSession().getRequest().getRemoteRepositories() );
+        
+        List<ArtifactRepository> remoteRepositories =
+            new ArrayList<ArtifactRepository>( mavenReportExecutorRequest.getProject().getRemoteArtifactRepositories() );
+        remoteRepositories.addAll( mavenReportExecutorRequest.getProject().getPluginArtifactRepositories() );
+        remoteRepositories.addAll( mavenReportExecutorRequest.getMavenSession().getRequest().getRemoteRepositories() );
+        repositoryRequest.setRemoteRepositories( remoteRepositories );
 
         try
         {