You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by de...@apache.org on 2012/10/09 21:10:32 UTC

svn commit: r1396207 - in /creadur/rat/trunk: apache-rat-plugin/pom.xml apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java pom.xml

Author: dennisl
Date: Tue Oct  9 19:10:32 2012
New Revision: 1396207

URL: http://svn.apache.org/viewvc?rev=1396207&view=rev
Log:
[RAT-78] Support doxia 1.1.2

- This also required a new minimum Maven version of 2.2.1

Modified:
    creadur/rat/trunk/apache-rat-plugin/pom.xml
    creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
    creadur/rat/trunk/pom.xml

Modified: creadur/rat/trunk/apache-rat-plugin/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/pom.xml?rev=1396207&r1=1396206&r2=1396207&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/pom.xml (original)
+++ creadur/rat/trunk/apache-rat-plugin/pom.xml Tue Oct  9 19:10:32 2012
@@ -34,8 +34,8 @@
 
   <properties>
     <currentVersion>${project.version}</currentVersion>
-    <doxiaVersion>1.0-alpha-8</doxiaVersion>
-    <doxiaSitetoolsVersion>1.0-alpha-8</doxiaSitetoolsVersion>
+    <doxiaVersion>1.2</doxiaVersion>
+    <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
     <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion>
   </properties>
   
@@ -189,13 +189,7 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-impl</artifactId>
-      <!-- This is the implementation version which has a different release cycle than Maven core -->
-      <version>2.0.4</version>
+      <version>3.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

Modified: creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java?rev=1396207&r1=1396206&r2=1396207&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java Tue Oct  9 19:10:32 2012
@@ -27,7 +27,7 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.sink.render.RenderingContext;
 import org.apache.maven.doxia.site.decoration.Body;
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.maven.doxia.site.decoration.Skin;

Modified: creadur/rat/trunk/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/pom.xml?rev=1396207&r1=1396206&r2=1396207&view=diff
==============================================================================
--- creadur/rat/trunk/pom.xml (original)
+++ creadur/rat/trunk/pom.xml Tue Oct  9 19:10:32 2012
@@ -48,7 +48,7 @@ agnostic home for software distribution 
 
   <properties>
     <javaVersion>1.5</javaVersion>
-    <mavenVersion>2.0.6</mavenVersion>
+    <mavenVersion>2.2.1</mavenVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!--
       These properties are to allow deployment to another target than