Author: snoopdave
Date: Sun Oct 3 15:46:19 2010
New Revision: 1003979
URL: http://svn.apache.org/viewvc?rev=1003979&view=rev
Log:
Fix for https://issues.apache.org/jira/browse/ROL-1883. The ${user.home}
variable was being substituted via the Maven Copy Resources operation so I
turned filtering off.
Also, some tweaks that allow Roller to build with Maven 3.0 beta 3
Modified:
roller/trunk/planet-business/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-web/src/test/resources/roller-custom.properties
Modified: roller/trunk/planet-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1003979&r1=1003978&r2=1003979&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sun Oct 3 15:46:19 2010
@@ -106,7 +106,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.apache.derby</groupId>
@@ -118,19 +118,19 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
@@ -201,25 +201,25 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>${derby.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Modified: roller/trunk/weblogger-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1003979&r1=1003978&r2=1003979&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sun Oct 3 15:46:19 2010
@@ -229,25 +229,25 @@
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
<version>${roller.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>${derby.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
@@ -356,7 +356,7 @@
<resources>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
+ <filtering>false</filtering>
<includes>
<include>**/**</include>
</includes>
Modified: roller/trunk/weblogger-web/src/test/resources/roller-custom.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/test/resources/roller-custom.properties?rev=1003979&r1=1003978&r2=1003979&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/test/resources/roller-custom.properties
(original)
+++ roller/trunk/weblogger-web/src/test/resources/roller-custom.properties Sun
Oct 3 15:46:19 2010
@@ -16,7 +16,7 @@ openjpa.Log=commons
passwds.encryption.enabled=false
# use src copy of themes for read-only access
-themes.dir=${basedir}/src/main/webapp/themes
+themes.dir=${basedir}/../weblogger-webapp/src/main/webapp/themes
# put work in work dir
search.index.dir =${project.build.directory}/work/search-index
