You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by he...@apache.org on 2010/10/21 07:21:45 UTC
svn commit: r1025826 - in /velocity/site/tools/velocity-site-news-plugin:
pom.xml
src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java
src/main/java/org/apache/velocity/site/plexus/PlexusKludgeUtils.java
Author: henning
Date: Thu Oct 21 05:21:45 2010
New Revision: 1025826
URL: http://svn.apache.org/viewvc?rev=1025826&view=rev
Log:
Fix the dependencies for the news plugin, make it actually work with maven 2.2.1
Modified:
velocity/site/tools/velocity-site-news-plugin/pom.xml
velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java
velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/plexus/PlexusKludgeUtils.java
Modified: velocity/site/tools/velocity-site-news-plugin/pom.xml
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news-plugin/pom.xml?rev=1025826&r1=1025825&r2=1025826&view=diff
==============================================================================
--- velocity/site/tools/velocity-site-news-plugin/pom.xml (original)
+++ velocity/site/tools/velocity-site-news-plugin/pom.xml Thu Oct 21 05:21:45 2010
@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,8 @@
<parent>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-tools</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.velocity.site</groupId>
@@ -36,7 +37,6 @@
<name>Velocity Site News Plugin</name>
<url>http://velocity.apache.org/site/tools/velocity-site-news-plugin</url>
- <version>1.3.0-SNAPSHOT</version>
<description>
This plugin generates a news page and rss feed from news items.
</description>
@@ -95,13 +95,25 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.1</version>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
+ <version>2.5</version>
</dependency>
+
+ <dependency>
+ <groupId>rome</groupId>
+ <artifactId>rome</artifactId>
+ <version>0.8</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
@@ -115,18 +127,14 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.2.1</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.5</version>
+ <version>2.0.4.2</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
@@ -138,21 +146,6 @@
<version>1.1.3</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <version>0.8</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>1.1.3</version>
@@ -162,6 +155,18 @@
<artifactId>doxia-module-apt</artifactId>
<version>1.1.3</version>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-30</version>
+ </dependency>
+
</dependencies>
<distributionManagement>
Modified: velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java?rev=1025826&r1=1025825&r2=1025826&view=diff
==============================================================================
--- velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java (original)
+++ velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java Thu Oct 21 05:21:45 2010
@@ -29,7 +29,6 @@ import org.apache.maven.doxia.parser.Par
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.apache.velocity.site.news.NewsReport;
import org.apache.velocity.site.news.VelocityNewsException;
@@ -52,7 +51,7 @@ import org.codehaus.plexus.personality.p
* @phase site
* @goal news
*/
-public class VelocityNewsReport extends AbstractMavenReport implements MavenReport, NewsReport, NewsFeed, Contextualizable
+public class VelocityNewsReport extends AbstractMavenReport implements NewsReport, NewsFeed, Contextualizable
{
/**
Modified: velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/plexus/PlexusKludgeUtils.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/plexus/PlexusKludgeUtils.java?rev=1025826&r1=1025825&r2=1025826&view=diff
==============================================================================
--- velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/plexus/PlexusKludgeUtils.java (original)
+++ velocity/site/tools/velocity-site-news-plugin/src/main/java/org/apache/velocity/site/plexus/PlexusKludgeUtils.java Thu Oct 21 05:21:45 2010
@@ -21,9 +21,9 @@ package org.apache.velocity.site.plexus;
import java.lang.reflect.Field;
-import org.codehaus.classworlds.ClassRealm;
-import org.codehaus.classworlds.NoSuchRealmException;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
public abstract class PlexusKludgeUtils
{