[jboss-cvs] JBossAS SVN: r70513 - in trunk: j2se and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2008-03-06 15:49:40 -0500 (Thu, 06 Mar 2008)
New Revision: 70513

Modified:
   trunk/j2se/pom.xml
   trunk/pom.xml
Log:
Moving the jar plugin test-jar generation out of the parent pom.  Updating a few dependencies.

Modified: trunk/j2se/pom.xml
===================================================================
--- trunk/j2se/pom.xml	2008-03-06 20:29:28 UTC (rev 70512)
+++ trunk/j2se/pom.xml	2008-03-06 20:49:40 UTC (rev 70513)
@@ -30,6 +30,18 @@
 					<testFailureIgnore>true</testFailureIgnore>
 				</configuration>
 			</plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-03-06 20:29:28 UTC (rev 70512)
+++ trunk/pom.xml	2008-03-06 20:49:40 UTC (rev 70513)
@@ -68,10 +68,21 @@
   
   <build>
     
+    <!-- Define default plugin behaviour for modules. -->
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+            <showDeprecation>false</showDeprecation>
+            <showWarnings>false</showWarnings>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.2</version>
           <configuration>
@@ -80,6 +91,9 @@
                 <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
               </manifest>
+              <manifestEntries>
+                <Implementation-URL>${pom.url}</Implementation-URL>
+              </manifestEntries>
             </archive>
           </configuration>
         </plugin>
@@ -101,41 +115,6 @@
       </plugins>
     </pluginManagement>
     
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test-jar</id>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-            <manifestEntries>
-              <Implementation-URL>${pom.url}</Implementation-URL>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <showDeprecation>false</showDeprecation>
-          <showWarnings>false</showWarnings>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
   
   <pluginRepositories>
@@ -297,9 +276,19 @@
       <dependency>
         <groupId>dom4j</groupId>
         <artifactId>dom4j</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.1-jboss</version>
       </dependency>
       <dependency>
+        <groupId>easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>easymock</groupId>
+        <artifactId>easymockclassextension</artifactId>
+        <version>1.1</version>
+      </dependency>
+      <dependency>
         <groupId>hibernate</groupId>
         <artifactId>hibernate3</artifactId>
         <version>3.2.4.SP1</version>
@@ -310,6 +299,11 @@
         <version>1.8.0.7</version>
       </dependency>
       <dependency>
+        <groupId>httpunit</groupId>
+        <artifactId>httpunit</artifactId>
+        <version>1.6</version>
+      </dependency>
+      <dependency>
         <groupId>jacorb</groupId>
         <artifactId>idl</artifactId>
         <version>2.2.2.jboss.patch3</version>
@@ -1005,6 +999,7 @@
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-ant-tasks</artifactId>
         <version>2.0.8</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>