[WebMacro-cvs] webmacro build.xml,1.52,1.53 pom.xml,1.14,1.15

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

Update of /cvsroot/webmacro/webmacro
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30384

Modified Files:
	build.xml pom.xml 
Log Message:
Move up to servlet 2.3, version concurrent jar


Index: pom.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/pom.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pom.xml	5 Nov 2008 23:05:39 -0000	1.14
--- pom.xml	12 Nov 2008 21:22:27 -0000	1.15
***************
*** 241,256 ****
            <useFile>true</useFile>
            <excludes>
-             <!-- Ant filtered guck -->
-             <exclude>**/TestVersion.java</exclude>
              <!-- Works on windows but not linux/maven -->
!             <exclude>**/TestWindows1251Encoding.java</exclude>
              <!-- Maven HACK -->
              <exclude>**/*$*</exclude>
              <!-- works in eclipse, but not maven -->
!             <exclude>**/TestBackupCharStream.java</exclude>
              <!-- works in eclipse, but not maven -->
!             <exclude>**/TestParseIncludeMacroDistribution.java</exclude>
              <!-- works in eclipse, but not maven -->
!             <exclude>**/TestSetpropsDirective.java</exclude>
             </excludes>
             <includes>
--- 241,254 ----
            <useFile>true</useFile>
            <excludes>
              <!-- Works on windows but not linux/maven -->
!             <!-- exclude>**/TestWindows1251Encoding.java</exclude -->
              <!-- Maven HACK -->
              <exclude>**/*$*</exclude>
              <!-- works in eclipse, but not maven -->
!             <!-- exclude>**/TestBackupCharStream.java</exclude -->
              <!-- works in eclipse, but not maven -->
!             <!-- exclude>**/TestParseIncludeMacroDistribution.java</exclude -->
              <!-- works in eclipse, but not maven -->
!             <!-- exclude>**/TestSetpropsDirective.java</exclude -->
             </excludes>
             <includes>
***************
*** 338,342 ****
        <groupId>javax.servlet</groupId>
        <artifactId>servlet-api</artifactId>
!       <version>2.2</version>
        <scope>compile</scope>
      </dependency>
--- 336,340 ----
        <groupId>javax.servlet</groupId>
        <artifactId>servlet-api</artifactId>
!       <version>2.3</version>
        <scope>compile</scope>
      </dependency>

Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** build.xml	5 Nov 2008 23:24:52 -0000	1.52
--- build.xml	12 Nov 2008 21:22:27 -0000	1.53
***************
*** 194,199 ****
          <copy todir="${dist.binary}" file="${jar}"/>
          <copy todir="${dist.binary}" file="${adapters-jar}"/>
!         <copy todir="${dist.binary}" file="lib/concurrent.jar" />
!         <copy todir="${dist.binary}" file="lib/servlet-2.2.jar" />
          <copy todir="${dist.binary}">
              <fileset dir="distroot" />
--- 194,199 ----
          <copy todir="${dist.binary}" file="${jar}"/>
          <copy todir="${dist.binary}" file="${adapters-jar}"/>
!         <copy todir="${dist.binary}" file="lib/concurrent-1.3.4.jar" />
!         <copy todir="${dist.binary}" file="lib/servlet-api-2.3.jar" />
          <copy todir="${dist.binary}">
              <fileset dir="distroot" />