[WebMacro-cvs] webmacro/webmacro pom.xml,1.25,1.26

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/webmacro
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20022

Modified Files:
	pom.xml 
Log Message:
Use java.util.concurrent

Index: pom.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** pom.xml	20 Feb 2010 21:59:23 -0000	1.25
--- pom.xml	21 Feb 2010 01:49:49 -0000	1.26
***************
*** 183,188 ****
    </organization>
    <build>
!     <sourceDirectory>src</sourceDirectory>
!     <testSourceDirectory>test/unit</testSourceDirectory>
      <resources>
        <resource>
--- 183,188 ----
    </organization>
    <build>
!     <sourceDirectory>src/main/java</sourceDirectory>
!     <testSourceDirectory>src/test/java</testSourceDirectory>
      <resources>
        <resource>
***************
*** 194,198 ****
        </resource>
        <resource>
!         <directory>src</directory>
          <includes>
            <include>**/*.wm</include>
--- 194,198 ----
        </resource>
        <resource>
!         <directory>src/main/java</directory>
          <includes>
            <include>**/*.wm</include>
***************
*** 205,209 ****
        </resource>
        <resource>
!         <directory>macros</directory>
          <includes>
            <include>**/*.wmm</include>
--- 205,209 ----
        </resource>
        <resource>
!         <directory>src/main/resources/macros</directory>
          <includes>
            <include>**/*.wmm</include>
***************
*** 213,217 ****
      <testResources>
        <testResource>
!         <directory>test/unit</directory>
          <includes>
            <include>**/*.wm</include>
--- 213,217 ----
      <testResources>
        <testResource>
!         <directory>src/test/java</directory>
          <includes>
            <include>**/*.wm</include>
***************
*** 222,225 ****
--- 222,226 ----
          </includes>
        </testResource>
+ <!--
        <testResource>
          <directory>macros</directory>
***************
*** 228,233 ****
--- 229,236 ----
          </includes>
        </testResource>
+ -->      
      </testResources>
      <plugins>
+     <!--
        <plugin>
          <groupId>org.codehaus.mojo</groupId>
***************
*** 246,249 ****
--- 249,253 ----
          </executions>
        </plugin>
+       -->
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
***************
*** 270,274 ****
          <artifactId>maven-javadoc-plugin</artifactId>
          <configuration>
!           <source>1.4</source>
            <docencoding>UTF-8</docencoding>
          </configuration>
--- 274,278 ----
          <artifactId>maven-javadoc-plugin</artifactId>
          <configuration>
!           <source>1.6</source>
            <docencoding>UTF-8</docencoding>
          </configuration>
***************
*** 280,285 ****
            <optimize>false</optimize>
            <showDeprecation>false</showDeprecation>
!           <source>1.4</source>
!           <target>1.4</target>
          </configuration>
        </plugin>
--- 284,289 ----
            <optimize>false</optimize>
            <showDeprecation>false</showDeprecation>
!           <source>1.6</source>
!           <target>1.6</target>
          </configuration>
        </plugin>
***************
*** 312,321 ****
    <dependencies>
      <dependency>
-       <groupId>org.apache.ant</groupId>
-       <artifactId>ant</artifactId>
-       <version>1.7.0</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
        <groupId>commons-logging</groupId>
        <artifactId>commons-logging</artifactId>
--- 316,319 ----
***************
*** 335,356 ****
        <scope>compile</scope>
      </dependency>
-     <dependency>
-       <groupId>org.springframework</groupId>
-       <artifactId>spring</artifactId>
-       <version>1.2.6</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.springframework</groupId>
-       <artifactId>spring-mock</artifactId>
-       <version>1.2.6</version>
-       <scope>compile</scope>
-     </dependency>
- 
  
      <dependency>
        <groupId>jakarta-regexp</groupId>
        <artifactId>jakarta-regexp</artifactId>
!       <version>1.4</version>
        <scope>test</scope>
      </dependency>
--- 333,341 ----
        <scope>compile</scope>
      </dependency>
  
      <dependency>
        <groupId>jakarta-regexp</groupId>
        <artifactId>jakarta-regexp</artifactId>
!       <version>1.6</version>
        <scope>test</scope>
      </dependency>
***************
*** 358,362 ****
       <groupId>net.sourceforge.jwebunit</groupId>
       <artifactId>jwebunit-core</artifactId>
!      <version>1.4.1</version>
       <scope>test</scope>
      </dependency>
--- 343,347 ----
       <groupId>net.sourceforge.jwebunit</groupId>
       <artifactId>jwebunit-core</artifactId>
!      <version>1.6.1</version>
       <scope>test</scope>
      </dependency>
***************
*** 364,368 ****
       <groupId>net.sourceforge.jwebunit</groupId>
       <artifactId>jwebunit-htmlunit-plugin</artifactId>
!      <version>1.4.1</version>
       <scope>test</scope>
      </dependency>
--- 349,353 ----
       <groupId>net.sourceforge.jwebunit</groupId>
       <artifactId>jwebunit-htmlunit-plugin</artifactId>
!      <version>1.6.1</version>
       <scope>test</scope>
      </dependency>