[embjopr-commits] EMBJOPR SVN: r832 - trunk/jsfunit.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-11-04 18:31:32 -0500 (Wed, 04 Nov 2009)
New Revision: 832

Modified:
   trunk/jsfunit/pom.xml
Log:
 * POM: Fixed the excludes of <resources>:  * --> **/*
 * POM: Version conflicts fixed in dependencyManagement: 
     org.jboss:jboss-common-core:2.2.14.GA
     sun-jaxb:jaxb-api:2.1.9
 * POM: <mavenConflictResolvers>newest,nearest</mavenConflictResolvers>

Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml	2009-11-04 04:19:03 UTC (rev 831)
+++ trunk/jsfunit/pom.xml	2009-11-04 23:31:32 UTC (rev 832)
@@ -5,6 +5,9 @@
    <modelVersion>4.0.0</modelVersion>
    
    <properties>
+      <!-- Does not work in Maven 2.2.1 -->
+      <mavenConflictResolvers>newest,nearest</mavenConflictResolvers>
+
       <jopr.version>1.2.0-SNAPSHOT</jopr.version>
       <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version>
       <jvm.args.debug></jvm.args.debug> <!-- Used by the -Pdebug profile. -->
@@ -68,6 +71,20 @@
    </pluginRepositories>
 
 
+   <dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+          <version>2.2.14.GA</version>
+        </dependency>
+        <dependency>
+          <groupId>sun-jaxb</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.1.9</version>
+        </dependency>
+      </dependencies>
+   </dependencyManagement>
 
    <dependencies>
 
@@ -811,7 +828,7 @@
       <resources>
         <resource>
           <directory>${basedir}/testdata</directory>
-          <excludes><exclude>*</exclude></excludes>
+          <excludes><exclude>**/*</exclude></excludes>
         </resource>
       </resources>