svn commit: r1719486 - in /maven/plugins/trunk/maven-site-plugin: pom.xml src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java

[hboutemy]

Author: hboutemy
Date: Fri Dec 11 18:27:07 2015
New Revision: 1719486

URL: http://svn.apache.org/viewvc?rev=1719486&view=rev
Log:
[DOXIASITETOOLS-122] updated calling code

Modified:
    maven/plugins/trunk/maven-site-plugin/pom.xml
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1719486&r1=1719485&r2=1719486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Dec 11 18:27:07 2015
@@ -330,12 +330,10 @@ under the License.
       <artifactId>doxia-site-renderer</artifactId>
       <version>${doxiaSitetoolsVersion}</version>
     </dependency>
-
-    <!-- Doxia Tools -->
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-integration-tools</artifactId>
-      <version>1.6</version>
+      <version>${doxiaSitetoolsVersion}</version>
     </dependency>
 
     <!-- Wagon -->

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1719486&r1=1719485&r2=1719486&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
 Fri Dec 11 18:27:07 2015
@@ -165,6 +165,6 @@ public abstract class AbstractSiteMojo
 
     protected List<Locale> getLocales()
     {
-        return siteTool.getAvailableLocales( locales );
+        return siteTool.getSiteLocales( locales );
     }
 }