Index: pom.xml
===================================================================
--- pom.xml	(revision 667938)
+++ pom.xml	(working copy)
@@ -135,6 +135,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>javacc-maven-plugin</artifactId>
+        <version>2.4.1</version>
         <executions>
           <execution>
             <id>generate-jjtree</id>
@@ -139,47 +140,8 @@
           <execution>
             <id>generate-jjtree</id>
             <phase>generate-sources</phase>
-            <configuration>
-              <sourceDirectory>${basedir}/src/main/jjtree/sieve</sourceDirectory>
-              <nodePackage>org.apache.jsieve.parser.generated</nodePackage>
-              <outputDirectory>${project.build.directory}/generated-sources/jjtree/org/apache/jsieve/parser/generated</outputDirectory>
-            </configuration>
-            <goals>
-              <goal>jjtree</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>generate-jjtree-address</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sourceDirectory>${basedir}/src/main/jjtree/address</sourceDirectory>
-              <nodePackage>org.apache.jsieve.parser.generated.address</nodePackage>
-              <outputDirectory>${project.build.directory}/generated-sources/jjtree2/org/apache/jsieve/parser/generated/address</outputDirectory>
-            </configuration>
-            <goals>
-              <goal>jjtree</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>generate-javacc-address</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sourceDirectory>${project.build.directory}/generated-sources/jjtree2/org/apache/jsieve/parser/generated/address</sourceDirectory>
-              <packageName>org.apache.jsieve.parser.generated.address</packageName>
-            </configuration>
-            <goals>
-              <goal>javacc</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>generate-javacc</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sourceDirectory>${project.build.directory}/generated-sources/jjtree/org/apache/jsieve/parser/generated</sourceDirectory>
-              <packageName>org.apache.jsieve.parser.generated</packageName>
-            </configuration>
             <goals>
-              <goal>javacc</goal>
+              <goal>jjtree-javacc</goal>
             </goals>
           </execution>
         </executions>
@@ -187,6 +149,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
         <configuration>
           <archive>
           <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -205,6 +168,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>bin</descriptorRef>
@@ -228,7 +192,7 @@
       <!-- Add NOTICE and LICENSE to generated JAR -->
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.0-alpha-5</version>
+        <version>1.0</version>
         <executions>
           <execution>
             <goals>
@@ -280,9 +244,11 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4.3</version>
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.4</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -287,9 +253,11 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jxr-maven-plugin</artifactId>
+        <version>2.0-beta-1</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.4</version>
         <configuration>
           <targetjdk>1.4</targetjdk>
           <rulesets>
@@ -304,6 +272,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
+        <version>2.0-beta-6</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -308,6 +277,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
         <configuration>
           <excludes>
             <exclude>NOTICE.base</exclude>