roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1062538 - in /roller/trunk: build-tomcat-release.sh planet-business/pom.xml weblogger-business/pom.xml weblogger-webapp/ weblogger-webapp/pom.xml
Date Sun, 23 Jan 2011 21:58:08 GMT
Author: snoopdave
Date: Sun Jan 23 21:58:08 2011
New Revision: 1062538

URL: http://svn.apache.org/viewvc?rev=1062538&view=rev
Log:
Making it easier to do a "dev" build... i.e. no need for -Dtomcat=true

Modified:
    roller/trunk/build-tomcat-release.sh
    roller/trunk/planet-business/pom.xml
    roller/trunk/weblogger-business/pom.xml
    roller/trunk/weblogger-webapp/   (props changed)
    roller/trunk/weblogger-webapp/pom.xml

Modified: roller/trunk/build-tomcat-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-tomcat-release.sh?rev=1062538&r1=1062537&r2=1062538&view=diff
==============================================================================
--- roller/trunk/build-tomcat-release.sh (original)
+++ roller/trunk/build-tomcat-release.sh Sun Jan 23 21:58:08 2011
@@ -1,6 +1,6 @@
 # How to build a Tomcat release of Roller
 mvn clean
-mvn -Dtomcat=true install
+mvn 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=1062538&r1=1062537&r2=1062538&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sun Jan 23 21:58:08 2011
@@ -379,8 +379,7 @@
             <!-- building for Tomcat, so add OpenJPA bytecode enhancement -->
             <activation>
                 <property>
-                    <name>tomcat</name>
-                    <value>true</value>
+                    <name>!javaee</name>
                 </property>
             </activation> 
             <dependencies>

Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1062538&r1=1062537&r2=1062538&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sun Jan 23 21:58:08 2011
@@ -444,8 +444,7 @@
             <!-- building for Tomcat, so add OpenJPA bytecode enhancement -->
             <activation>
                 <property>
-                    <name>tomcat</name>
-                    <value>true</value>
+                    <name>!javaee</name>
                 </property>
             </activation> 
             <dependencies>

Propchange: roller/trunk/weblogger-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jan 23 21:58:08 2011
@@ -1,4 +1,5 @@
+roller-startup.log
+.classpath
+.project
 target
 .settings
-.project
-.classpath

Modified: roller/trunk/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/pom.xml?rev=1062538&r1=1062537&r2=1062538&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Sun Jan 23 21:58:08 2011
@@ -270,7 +270,7 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.10</version>
+            <version>6.1.26</version>
             <scope>provided</scope>
         </dependency>
 
@@ -347,7 +347,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.9</version>
+                <version>6.1.26</version>
                 <configuration>
                     <contextPath>roller</contextPath>
                     <jettyConfig>${project.build.directory}/test-classes/jetty.xml</jettyConfig>



Mime
View raw message