Author: snoopdave
Date: Tue Dec 28 19:51:02 2010
New Revision: 1053415
URL: http://svn.apache.org/viewvc?rev=1053415&view=rev
Log:
- Cleaning up warnings in Maven POM files
- Also, building for Tomcat requires to -Dtomcat=true flag
Modified:
roller/trunk/README.txt
roller/trunk/build-tomcat-release.sh
roller/trunk/planet-business/pom.xml
roller/trunk/test-utils/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-web/pom.xml
roller/trunk/weblogger-webapp/pom.xml
Modified: roller/trunk/README.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/README.txt?rev=1053415&r1=1053414&r2=1053415&view=diff
==============================================================================
--- roller/trunk/README.txt (original)
+++ roller/trunk/README.txt Tue Dec 28 19:51:02 2010
@@ -32,7 +32,7 @@ After pulling the source tree and changi
indicated above, the following command will build and run all unit tests:
mvn clean
- mvn install
+ mvn -Dtomcat=true install
After doing that, you should find the newly built Roller webapp, suitable
for use with Tomcat in weblogger-web/target/roller.
@@ -41,7 +41,8 @@ To build Roller release files, you do th
cd weblogger-assembly
mvn install
-
+ cd ..
+
After that, you'll find Roller distribution files in
weblogger-assembly/target.
The Tomcat specific release files will have 'for-tomcat' in their names.
@@ -61,9 +62,11 @@ Roller release files that will work on a
cd weblogger-war-assembly
mvn -Djavaee=true install
+ cd ..
- cd ../weblogger-assembly
+ cd weblogger-assembly
mvn -Djavaee=true install
+ cd ..
When that finishes, you will find Roller distribution files in
weblogger-assembly/target. The Java EE specific release files will have
@@ -84,16 +87,30 @@ Roller release files that will work on a
cd weblogger-war-assembly
mvn -Djboss=true install
+ cd ..
- cd ../weblogger-assembly
+ cd weblogger-assembly
mvn -Djboss=true install
+ cd ..
When that finishes, you will find Roller distribution files in
weblogger-assembly/target. The Java EE specific release files will have
'for-jboss' in their names.
-NOTE: If you wish to pull a branch other than the trunk, replace the word
+---------------------------
+NOTES
+
+1) Set MAVEN_OPTS to include your preferred server
+
+If you always build for one server, then you might wish to define
+MAVEN_OPTS to include your preferred server flag, for example:
+
+ export MAVEN_OPTS=${MAVEN_OPTS} -Dtomcat=true
+
+2) Building other versions of Roller
+
+If you wish to pull a branch other than the trunk, replace the word
"trunk" in both lines above with the appropriate branch name. Note that
versions of Roller before 5.0 have an ant-based build. In general, you should
be able to follow instructions accompanying the sources that you pull in order
Modified: roller/trunk/build-tomcat-release.sh
URL:
http://svn.apache.org/viewvc/roller/trunk/build-tomcat-release.sh?rev=1053415&r1=1053414&r2=1053415&view=diff
==============================================================================
--- roller/trunk/build-tomcat-release.sh (original)
+++ roller/trunk/build-tomcat-release.sh Tue Dec 28 19:51:02 2010
@@ -1,6 +1,6 @@
# How to build a Tomcat release of Roller
mvn clean
-mvn install
+mvn -Dtomcat=true install
pushd weblogger-war-assembly
mvn clean
Modified: roller/trunk/planet-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1053415&r1=1053414&r2=1053415&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Tue Dec 28 19:51:02 2010
@@ -376,9 +376,12 @@
<profile>
<id>openjpa</id>
- <!-- to turn off OpenJPA bytecode enhancement define property
'-Djavaee=true' -->
+ <!-- building for Tomcat, so add OpenJPA bytecode enhancement -->
<activation>
- <property><name>!javaee</name></property>
+ <property>
+ <name>tomcat</name>
+ <value>true</value>
+ </property>
</activation>
<dependencies>
<dependency>
Modified: roller/trunk/test-utils/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=1053415&r1=1053414&r2=1053415&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Tue Dec 28 19:51:02 2010
@@ -14,14 +14,14 @@
<name>Apache Roller Test Utilities</name>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>${roller.version}</version>
+ <version>5.0.0-RC3</version>
<dependencies>
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
- <version>${roller.version}</version>
+ <version>5.0.0-RC3</version>
</dependency>
<dependency>
Modified: roller/trunk/weblogger-business/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1053415&r1=1053414&r2=1053415&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Tue Dec 28 19:51:02 2010
@@ -441,9 +441,12 @@
<profile>
<id>openjpa</id>
- <!-- to turn off OpenJPA bytecode enhancement define property
'-Djavaee=true' -->
+ <!-- building for Tomcat, so add OpenJPA bytecode enhancement -->
<activation>
- <property><name>!javaee</name></property>
+ <property>
+ <name>tomcat</name>
+ <value>true</value>
+ </property>
</activation>
<dependencies>
<dependency>
Modified: roller/trunk/weblogger-web/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1053415&r1=1053414&r2=1053415&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Tue Dec 28 19:51:02 2010
@@ -15,7 +15,7 @@
<name>Apache Roller Weblogger Web Module</name>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-web</artifactId>
- <version>${roller.version}</version>
+ <version>5.0.0-RC3</version>
<packaging>jar</packaging>
<dependencies>
@@ -387,6 +387,8 @@
<plugin>
<artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+
<executions>
<execution>
@@ -423,7 +425,28 @@
</configuration>
</execution>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/roller/WEB-INF/classes/dbscripts</outputDirectory>
+ <resources>
+ <resource>
+
<directory>../weblogger-business/target/dbscripts</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.sql</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
</executions>
+
<configuration>
<includeEmptyDirs>true</includeEmptyDirs>
</configuration>
@@ -530,32 +553,6 @@
</executions>
</plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/roller/WEB-INF/classes/dbscripts</outputDirectory>
- <resources>
- <resource>
-
<directory>../weblogger-business/target/dbscripts</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.sql</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
<testResources>
Modified: roller/trunk/weblogger-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/pom.xml?rev=1053415&r1=1053414&r2=1053415&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Tue Dec 28 19:51:02 2010
@@ -14,7 +14,7 @@
<name>Apache Roller Weblogger Web Application</name>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-webapp</artifactId>
- <version>${roller.version}</version>
+ <version>5.0.0-RC3</version>
<packaging>war</packaging>
<dependencies>
@@ -347,6 +347,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.9</version>
<configuration>
<contextPath>roller</contextPath>
<jettyConfig>${project.build.directory}/test-classes/jetty.xml</jettyConfig>
