Author: snoopdave
Date: Sun Jan 17 14:24:28 2010
New Revision: 900145
URL: http://svn.apache.org/viewvc?rev=900145&view=rev
Log:
Fixes to POMs suggested by Matt Raible
Modified:
roller/trunk/planet-business/pom.xml
roller/trunk/pom.xml
roller/trunk/roller-core/pom.xml
roller/trunk/test-utils/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-web/pom.xml
Modified: roller/trunk/planet-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=900145&r1=900144&r2=900145&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sun Jan 17 14:24:28 2010
@@ -1,5 +1,8 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.roller</groupId>
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=900145&r1=900144&r2=900145&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sun Jan 17 14:24:28 2010
@@ -1,9 +1,12 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
-
+
<version>5.0-BETA2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -21,6 +24,10 @@
<url>http://svn.apache.org/viewvc/roller/trunk</url>
</scm>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>roller-core</module>
<module>test-utils</module>
@@ -121,7 +128,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -129,7 +135,6 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -137,7 +142,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -145,7 +149,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -153,7 +156,6 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.4</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -169,7 +171,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>2.9.0</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -224,7 +225,6 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.1</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -233,7 +233,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>2.1.6</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -241,7 +240,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
<version>2.1.6</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -304,28 +302,24 @@
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
<version>3.1.2</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
<version>3.1.2</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-server</artifactId>
<version>3.1.2</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.util</groupId>
<artifactId>ws-commons-util</artifactId>
<version>1.0.2</version>
- <type>jar</type>
</dependency>
<!-- Java EE deps -->
@@ -334,7 +328,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>1.2.1</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -342,7 +335,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
- <type>jar</type>
<scope>compile</scope>
</dependency>
@@ -350,7 +342,6 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
@@ -366,7 +357,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.1</version>
- <type>jar</type>
</dependency>
<dependency>
@@ -391,14 +381,12 @@
<groupId>simple-jndi</groupId>
<artifactId>simple-jndi</artifactId>
<version>0.11.4</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
- <type>jar</type>
</dependency>
</dependencies>
Modified: roller/trunk/roller-core/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/roller-core/pom.xml?rev=900145&r1=900144&r2=900145&view=diff
==============================================================================
--- roller/trunk/roller-core/pom.xml (original)
+++ roller/trunk/roller-core/pom.xml Sun Jan 17 14:24:28 2010
@@ -1,4 +1,7 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: roller/trunk/test-utils/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=900145&r1=900144&r2=900145&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Sun Jan 17 14:24:28 2010
@@ -1,5 +1,8 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.roller</groupId>
Modified: roller/trunk/weblogger-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=900145&r1=900144&r2=900145&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sun Jan 17 14:24:28 2010
@@ -1,4 +1,7 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: roller/trunk/weblogger-web/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=900145&r1=900144&r2=900145&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Sun Jan 17 14:24:28 2010
@@ -1,4 +1,6 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -97,12 +99,12 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
- <exclusions>
+ <!-- <exclusions>
<exclusion>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
</exclusion>
- </exclusions>
+ </exclusions> -->
</dependency>
<dependency>
@@ -225,6 +227,12 @@
<dependency>
<groupId>org.openid4java</groupId>
+ <artifactId>openid4java-consumer</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+
+ <!-- <dependency>
+ <groupId>org.openid4java</groupId>
<artifactId>openid4java</artifactId>
<version>0.9.5</version>
<exclusions>
@@ -249,7 +257,7 @@
<artifactId>openid4java-server-JdbcServerAssociationStore</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>net.sf.ehcache</groupId>
