roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1502973 - in /roller/trunk: app/pom.xml pom.xml
Date Sun, 14 Jul 2013 13:38:30 GMT
Author: gmazza
Date: Sun Jul 14 13:38:29 2013
New Revision: 1502973

URL: http://svn.apache.org/r1502973
Log:
Switched to Maven 3 and JDK 6.0 requirement, updated plugins to most recent available (using
mvn versions:display-plugin-updates to confirm), this should result in Tomcat Jenkins build
now passing.

Modified:
    roller/trunk/app/pom.xml
    roller/trunk/pom.xml

Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1502973&r1=1502972&r2=1502973&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sun Jul 14 13:38:29 2013
@@ -559,7 +559,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <version>1.2</version>
-            <!-- <scope>provided</scope> -->
         </dependency>
 
         <dependency>
@@ -693,10 +692,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
+                    <version>3.0</version>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                         <fork>true</fork>
                         <encoding>${project.build.sourceEncoding}</encoding>
                     </configuration>
@@ -705,19 +704,19 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.3</version>
+                    <version>2.12.4</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.2</version>
+                    <version>1.7</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.4.1</version>
+                    <version>2.6</version>
                 </plugin>
 
                 <!-- Allow for standalone Tomcat deployment 
@@ -744,7 +743,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.3</version>
                 <configuration>
                     <attachClasses>true</attachClasses>
                 </configuration>
@@ -807,8 +806,7 @@
 
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.4.3</version>
-                
+               
                 <executions>
 
                     <execution>
@@ -931,7 +929,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <taskdef name="texen"
                                          classname="org.apache.velocity.texen.ant.TexenTask"
                                          classpathref="maven.compile.classpath"/>
@@ -941,7 +939,7 @@
                                     templatePath     ="${basedir}/src/main/resources/sql"
                                     outputDirectory  ="${basedir}/target/dbscripts"
                                     outputFile       ="README.txt"/>
-                            </tasks>
+                            </target>
                         </configuration>
                     </execution>
 
@@ -952,7 +950,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <!-- Derby only for unit testing and jetty:run dev testing:
skipped when maven.text.skip is set -->
                                 <delete dir="${basedir}/target/derby-system" verbose="true"
failonerror="false" />
                                 <taskdef name="startdb" classname="org.apache.roller.weblogger.ant.StartDerbyTask"
@@ -962,7 +960,7 @@
                                          databaseScriptsDir="${basedir}/target/dbscripts"
                                          skip="${maven.test.skip}" >
                                 </startdb>
-                            </tasks>
+                            </target>
                         </configuration>
                     </execution>
 
@@ -973,7 +971,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <!-- Derby only for unit testing: skip when maven.text.skip
is set -->
                                 <taskdef name="stopdb" classname="org.apache.roller.weblogger.ant.StopDerbyTask"
                                          classpathref="maven.test.classpath"/>
@@ -983,7 +981,7 @@
                                         skip="${maven.test.skip}" >
                                 </stopdb>
                                 <delete dir="${basedir}/target/derby-system" verbose="true"
failonerror="false" />
-                            </tasks>
+                            </target>
                         </configuration>
                     </execution>
 
@@ -993,7 +991,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.0-beta-3</version>
+                <version>1.2</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1502973&r1=1502972&r2=1502973&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sun Jul 14 13:38:29 2013
@@ -8,6 +8,10 @@
     <version>5.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
+
     <name>Roller project</name>
     <description>
         Roller is an open source blog server built with open source Java



Mime
View raw message