Author: snoopdave
Date: Sun Jan 3 15:13:18 2010
New Revision: 895418
URL: http://svn.apache.org/viewvc?rev=895418&view=rev
Log:
Cleaning up WEB-INF/lib via Maven exclusions
Modified:
roller/branches/roller_mavenized/planet-business/pom.xml
roller/branches/roller_mavenized/pom.xml
roller/branches/roller_mavenized/roller-core/pom.xml
roller/branches/roller_mavenized/weblogger-business/pom.xml
roller/branches/roller_mavenized/weblogger-web/pom.xml
Modified: roller/branches/roller_mavenized/planet-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mavenized/planet-business/pom.xml?rev=895418&r1=895417&r2=895418&view=diff
==============================================================================
--- roller/branches/roller_mavenized/planet-business/pom.xml (original)
+++ roller/branches/roller_mavenized/planet-business/pom.xml Sun Jan 3
15:13:18 2010
@@ -1,4 +1,4 @@
-<project>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,6 +28,16 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -87,6 +97,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -223,12 +239,12 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.4.2.0</version>
+ <version>10.5.3.0_1</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
- <version>10.4.2.0</version>
+ <version>10.5.3.0_1</version>
</dependency>
</dependencies>
<executions>
Modified: roller/branches/roller_mavenized/pom.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mavenized/pom.xml?rev=895418&r1=895417&r2=895418&view=diff
==============================================================================
--- roller/branches/roller_mavenized/pom.xml (original)
+++ roller/branches/roller_mavenized/pom.xml Sun Jan 3 15:13:18 2010
@@ -1,26 +1,26 @@
<project>
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
-
+
<version>5.0-BETA2-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<name>Apache Roller Project</name>
<description>
- Roller is an open source blog server built with open source Java
- libraries primarily Apache OpenJPA, Struts2, Velocity and Commons.
+ Roller is an open source blog server built with open source Java
+ libraries primarily Apache OpenJPA, Struts2, Velocity and Commons.
</description>
<url>http://roller.apache.org</url>
<inceptionYear>2002</inceptionYear>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/roller/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/roller/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/roller/trunk</url>
- </scm>
-
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/roller/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/roller/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/roller/trunk</url>
+ </scm>
+
<modules>
<module>roller-core</module>
<module>test-utils</module>
@@ -28,10 +28,10 @@
<module>weblogger-business</module>
<module>weblogger-web</module>
</modules>
-
+
<build>
<defaultGoal>install</defaultGoal>
-
+
<pluginManagement>
<plugins>
@@ -46,36 +46,36 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.2</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
<version>1.3</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4</version>
</plugin>
- </plugins>
-
- </pluginManagement>
+ </plugins>
+
+ </pluginManagement>
</build>
-
+
<repositories>
<repository>
<id>central</id>
@@ -87,8 +87,8 @@
</snapshots>
</repository>
<repository>
- <id>ibiblio</id>
- <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
+ <id>ibiblio</id>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
</repository>
<repository>
<id>oauth</id>
@@ -105,18 +105,18 @@
</repository>
<repository>
<id>snoopdave</id>
- <name>Temporary archive for ROME Propono 1.0rc1,
- TODO: replace with official ASAP</name>
+ <name>Temporary archive for ROME Propono 1.0rc1,
+ TODO: replace with official ASAP</name>
<url>http://people.apache.org/~snoopdave/repo/</url>
</repository>
</repositories>
-
+
<dependencyManagement>
<dependencies>
-
+
<!-- core deps -->
-
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -124,7 +124,7 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -132,23 +132,23 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
<type>jar</type>
<scope>compile</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<type>jar</type>
<scope>compile</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -156,15 +156,15 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
</dependency>
-
+
<!-- business deps -->
-
+
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
@@ -173,7 +173,7 @@
<scope>compile</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<version>1.0</version>
@@ -190,36 +190,36 @@
<artifactId>rome-propono</artifactId>
<version>1.0rc1</version>
</dependency>
-
+
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>
-
+
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
<version>20090531</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
<version>20090531</version>
<scope>compile</scope>
</dependency>
-
+
<!-- web deps -->
-
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>string</artifactId>
- <version>1.1.0</version>
- </dependency>
-
+
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>string</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -236,7 +236,7 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
@@ -245,12 +245,12 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-spring-plugin</artifactId>
- <version>2.1.6</version>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+
<!-- <dependency>
<groupId>com.google.inject.integration</groupId>
<artifactId>guice-struts2-plugin</artifactId>
@@ -268,24 +268,24 @@
</exclusion>
</exclusions>
</dependency> -->
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- <version>2.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>2.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-jsp</artifactId>
- <version>2.1.2</version>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-jsp</artifactId>
+ <version>2.1.2</version>
+ </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -300,36 +300,36 @@
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<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 -->
-
+
+ <!-- Java EE deps -->
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -346,21 +346,21 @@
<scope>compile</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- <!-- test deps -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <!-- test deps -->
<dependency>
<groupId>junit</groupId>
@@ -400,7 +400,7 @@
<version>1.7.1</version>
<type>jar</type>
</dependency>
-
- </dependencies>
+
+ </dependencies>
</dependencyManagement>
</project>
Modified: roller/branches/roller_mavenized/roller-core/pom.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mavenized/roller-core/pom.xml?rev=895418&r1=895417&r2=895418&view=diff
==============================================================================
--- roller/branches/roller_mavenized/roller-core/pom.xml (original)
+++ roller/branches/roller_mavenized/roller-core/pom.xml Sun Jan 3 15:13:18
2010
@@ -1,23 +1,23 @@
<project>
- <modelVersion>4.0.0</modelVersion>
-
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
<version>5.0-BETA2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<name>Apache Roller Core Module</name>
<description>
- Core code and resources used in other parts of Roller.
+ Core code and resources used in other parts of Roller.
</description>
- <groupId>org.apache.roller</groupId>
- <artifactId>roller-core</artifactId>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-core</artifactId>
<version>5.0-BETA2-SNAPSHOT</version>
-
+
<dependencies>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -37,7 +37,7 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
+
</dependencies>
-
+
</project>
\ No newline at end of file
Modified: roller/branches/roller_mavenized/weblogger-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/pom.xml?rev=895418&r1=895417&r2=895418&view=diff
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/pom.xml (original)
+++ roller/branches/roller_mavenized/weblogger-business/pom.xml Sun Jan 3
15:13:18 2010
@@ -1,25 +1,25 @@
<project>
- <modelVersion>4.0.0</modelVersion>
-
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
<version>5.0-BETA2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<name>Apache Roller Weblogger Business Module</name>
<description>
- Business logic and persistence for Roller Weblogger.
+ Business logic and persistence for Roller Weblogger.
</description>
- <groupId>org.apache.roller</groupId>
- <artifactId>roller-weblogger-business</artifactId>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-weblogger-business</artifactId>
<version>5.0-BETA2-SNAPSHOT</version>
<properties>
-
<testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
+
<testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
</properties>
-
+
<dependencies>
<dependency>
@@ -37,6 +37,16 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -109,26 +119,26 @@
<artifactId>texen</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-server</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.ws.commons.util</groupId>
<artifactId>ws-commons-util</artifactId>
</dependency>
-
+
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
@@ -161,18 +171,18 @@
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
-
+
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<includeEmptyDirs>true</includeEmptyDirs>
</configuration>
</plugin>
-
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -185,10 +195,10 @@
<name>context.realpath</name>
<value>${project.basedir}/src/main/webapp</value>
</property>
- <property>
-
<name>project.build.directory</name>
-
<value>${project.build.directory}</value>
- </property>
+ <property>
+ <name>project.build.directory</name>
+ <value>${project.build.directory}</value>
+ </property>
</systemProperties>
<excludes>
<exclude>**/TestUtils.java</exclude>
@@ -197,11 +207,11 @@
<!--
<includes>
<include>**/PlanetManagerLocalTest.java</include>
- </includes>
+ </includes>
-->
- </configuration>
+ </configuration>
</plugin>
-
+
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
@@ -217,9 +227,9 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<executions>
-
+
<execution>
<id>gen-db-scripts</id>
<phase>process-classes</phase>
@@ -230,17 +240,17 @@
<tasks>
<taskdef name="texen"
classname="org.apache.velocity.texen.ant.TexenTask"
-
classpathref="maven.compile.classpath"/>
+
classpathref="maven.compile.classpath"/>
<texen
- controlTemplate ="control.vm"
-
contextProperties="${project.build.outputDirectory}/sql/dbscripts.properties"
- templatePath
="${project.build.outputDirectory}/sql"
- outputDirectory
="${project.build.outputDirectory}/sql"
- outputFile="README.txt"/>
+ controlTemplate ="control.vm"
+
contextProperties="${project.build.outputDirectory}/sql/dbscripts.properties"
+ templatePath
="${project.build.outputDirectory}/sql"
+ outputDirectory
="${project.build.outputDirectory}/sql"
+ outputFile="README.txt"/>
</tasks>
</configuration>
</execution>
-
+
<execution>
<id>startdb</id>
<phase>process-test-resources</phase>
@@ -256,7 +266,7 @@
</tasks>
</configuration>
</execution>
-
+
<execution>
<id>stopdb</id>
<phase>package</phase>
@@ -273,10 +283,10 @@
</tasks>
</configuration>
</execution>
-
+
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
@@ -284,16 +294,16 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.4.2.0</version>
+ <version>10.5.3.0_1</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
- <version>10.4.2.0</version>
+ <version>10.5.3.0_1</version>
</dependency>
</dependencies>
<executions>
-
+
<execution>
<id>initdb</id>
<phase>process-test-resources</phase>
@@ -308,31 +318,31 @@
<autocommit>true</autocommit>
<onError>continue</onError>
<srcFiles>
-
<srcFile>${project.build.outputDirectory}/sql/droptables.sql</srcFile>
-
<srcFile>${project.build.outputDirectory}/sql/derby/createdb.sql</srcFile>
+
<srcFile>${project.build.outputDirectory}/sql/droptables.sql</srcFile>
+
<srcFile>${project.build.outputDirectory}/sql/derby/createdb.sql</srcFile>
</srcFiles>
</configuration>
</execution>
-
+
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.0-beta-3</version>
<executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
- <doUpdate>false</doUpdate>
+ <doUpdate>false</doUpdate>
</configuration>
- </plugin>
+ </plugin>
</plugins>
@@ -357,11 +367,11 @@
<includes>
<include>**/**</include>
</includes>
- </resource>
+ </resource>
</resources>
-
+
</build>
-
+
<profiles>
<profile>
<id>openjpa</id>
@@ -372,6 +382,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
<properties>
@@ -420,5 +431,5 @@
</properties>
</profile>
</profiles>
-
+
</project>
Modified: roller/branches/roller_mavenized/weblogger-web/pom.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-web/pom.xml?rev=895418&r1=895417&r2=895418&view=diff
==============================================================================
--- roller/branches/roller_mavenized/weblogger-web/pom.xml (original)
+++ roller/branches/roller_mavenized/weblogger-web/pom.xml Sun Jan 3 15:13:18
2010
@@ -1,6 +1,6 @@
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.roller</groupId>
@@ -8,14 +8,14 @@
<version>5.0-BETA2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<name>Apache Roller Weblogger Web Application</name>
- <groupId>org.apache.roller</groupId>
- <artifactId>roller-weblogger-web</artifactId>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-weblogger-web</artifactId>
<version>5.0-BETA2-SNAPSHOT</version>
<packaging>war</packaging>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.roller</groupId>
@@ -23,10 +23,24 @@
<version>5.0-BETA2-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-planet-business</artifactId>
<version>5.0-BETA2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-pool</artifactId>
+ <groupId>commons-pool</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging-api</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -35,10 +49,10 @@
<version>5.0-BETA2-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
@@ -57,154 +71,232 @@
<artifactId>spring-context</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
- <!-- <dependency>
+ <!-- <dependency>
<groupId>com.google.inject.integration</groupId>
<artifactId>guice-struts2-plugin</artifactId>
</dependency> -->
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-tiles-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>string</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-jsp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>string</artifactId>
- </dependency>
-
- <!-- Spring Security deps -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.5.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>2.0.5.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-openid</artifactId>
- <version>2.0.5.RELEASE</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-taglibs</artifactId>
- <version>2.0.5.RELEASE</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-acl</artifactId>
- <version>2.0.5.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- OpenID deps -->
-
- <dependency>
- <groupId>org.openxri</groupId>
- <artifactId>openxri-client</artifactId>
- <version>1.2.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.openxri</groupId>
- <artifactId>openxri-syntax</artifactId>
- <version>1.2.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- <version>0.9.5</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.6.2</version>
- </dependency>
-
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.3.0</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
-
- <!-- Java EE deps -->
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <!-- <scope>provided</scope> -->
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-tiles-plugin</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging-api</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>string</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-jsp</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-servlet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging-api</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>string</artifactId>
+ </dependency>
+
+ <!-- Spring Security deps -->
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.ldap</groupId>
+ <artifactId>spring-ldap</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>2.0.5.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-openid</artifactId>
+ <version>2.0.5.RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-taglibs</artifactId>
+ <version>2.0.5.RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-acl</artifactId>
+ <version>2.0.5.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-dao</artifactId>
+ <version>2.0.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- OpenID deps -->
+
+ <dependency>
+ <groupId>org.openxri</groupId>
+ <artifactId>openxri-client</artifactId>
+ <version>1.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jug</groupId>
+ <artifactId>jug</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openxri</groupId>
+ <artifactId>openxri-syntax</artifactId>
+ <version>1.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ <version>0.9.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-nodeps</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-consumer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-server-SampleServer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.openid4java</groupId>
+
<artifactId>openid4java-consumer-SampleConsumer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.openid4java</groupId>
+
<artifactId>openid4java-server-JdbcServerAssociationStore</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+
+ <!-- Java EE deps -->
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <!-- <scope>provided</scope> -->
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- test deps -->
+ <!-- test deps -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -217,135 +309,147 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.2</version>
- <scope>test</scope>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-pool</artifactId>
+ <groupId>commons-pool</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>simple-jndi</groupId>
- <artifactId>simple-jndi</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>simple-jndi</groupId>
+ <artifactId>simple-jndi</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
<version>5.0-BETA2-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
-
- <finalName>roller</finalName>
-
- <plugins>
-
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
-
<jettyEnvXml>${project.build.directory}/jetty-env.xml</jettyEnvXml>
- <systemProperties>
- <systemProperty>
- <name>roller.custom.config</name>
-
<value>${project.build.directory}/testsetup/roller-custom.properties</value>
- </systemProperty>
- <systemProperty>
- <name>planet.custom.config</name>
-
<value>${project.build.directory}/testsetup/planet-custom.properties</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
-
- <execution>
- <id>copy-test-properties</id>
- <phase>validate</phase>
- <goals><goal>copy-resources</goal></goals>
- <configuration>
-
<outputDirectory>${basedir}/target/testsetup</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
- <execution>
- <id>copy-test-config</id>
- <phase>validate</phase>
- <goals><goal>copy-resources</goal></goals>
- <configuration>
- <outputDirectory>${basedir}/target/</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
- </executions>
- <configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
-
<name>catalina.base</name>
-
<value>${project.build.testOutputDirectory}</value>
- </property>
- <property>
-
<name>context.realpath</name>
-
<value>${project.basedir}/src/main/webapp</value>
- </property>
- <property>
-
<name>project.build.directory</name>
-
<value>${project.build.directory}</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TestUtils.java</exclude>
- <exclude>**/TestTask.java</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <exclusion>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <finalName>roller</finalName>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+
<jettyEnvXml>${project.build.directory}/jetty-env.xml</jettyEnvXml>
+ <systemProperties>
+ <systemProperty>
+ <name>roller.custom.config</name>
+
<value>${project.build.directory}/testsetup/roller-custom.properties</value>
+ </systemProperty>
+ <systemProperty>
+ <name>planet.custom.config</name>
+
<value>${project.build.directory}/testsetup/planet-custom.properties</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <id>copy-test-properties</id>
+ <phase>validate</phase>
+ <goals><goal>copy-resources</goal></goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/testsetup</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-test-config</id>
+ <phase>validate</phase>
+ <goals><goal>copy-resources</goal></goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ </executions>
+ <configuration>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>catalina.base</name>
+ <value>${project.build.testOutputDirectory}</value>
+ </property>
+ <property>
+ <name>context.realpath</name>
+ <value>${project.basedir}/src/main/webapp</value>
+ </property>
+ <property>
+ <name>project.build.directory</name>
+ <value>${project.build.directory}</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/TestUtils.java</exclude>
+ <exclude>**/TestTask.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -357,9 +461,9 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<executions>
-
+
<execution>
<id>startdb</id>
<phase>process-test-resources</phase>
@@ -375,7 +479,7 @@
</tasks>
</configuration>
</execution>
-
+
<execution>
<id>stopdb</id>
<phase>package</phase>
@@ -384,7 +488,7 @@
</goals>
<configuration>
<tasks>
-<!--
+ <!--
<taskdef name="stopdb"
classname="org.apache.roller.weblogger.ant.StopDerbyTask"
classpathref="maven.compile.classpath"/>
<stopdb port="3219"></stopdb>
@@ -393,10 +497,10 @@
</tasks>
</configuration>
</execution>
-
+
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
@@ -413,7 +517,7 @@
</dependency>
</dependencies>
<executions>
-
+
<execution>
<id>initdb</id>
<phase>process-test-resources</phase>
@@ -428,31 +532,31 @@
<autocommit>true</autocommit>
<onError>continue</onError>
<srcFiles>
-
<srcFile>${project.build.outputDirectory}/../../../weblogger-business/target/classes/sql/droptables.sql</srcFile>
-
<srcFile>${project.build.outputDirectory}/../../../weblogger-business/target/classes/sql/derby/createdb.sql</srcFile>
+
<srcFile>${project.build.outputDirectory}/../../../weblogger-business/target/classes/sql/droptables.sql</srcFile>
+
<srcFile>${project.build.outputDirectory}/../../../weblogger-business/target/classes/sql/derby/createdb.sql</srcFile>
</srcFiles>
</configuration>
</execution>
-
+
</executions>
</plugin>
- </plugins>
+ </plugins>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
<profiles>
@@ -476,3 +580,4 @@
</project>
+
