update POMS

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@897744 13f79535-47bb-0310-9956-ffa450edef68

src/etc/poms/ant-antlr/pom.xml

@@ -58,8 +58,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include>
           </includes>

src/etc/poms/ant-apache-bcel/pom.xml

@@ -53,8 +53,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/tfilters/util/JavaClassHelper*</include>
             <include>org/apache/tools/ant/tutil/depend/bcel/*</include>

src/etc/poms/ant-apache-bsf/pom.xml

@@ -53,8 +53,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/Script*</include>
             <include>org/apache/tools/ant/taskdefs/optional/script/**</include>

src/etc/poms/ant-apache-log4j/pom.xml

@@ -52,8 +52,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/listener/Log4jListener*</include>
           </includes>

src/etc/poms/ant-apache-oro/pom.xml

@@ -53,8 +53,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/util/regexp/JakartaOro*</include>
             <include>org/apache/tools/ant/taskdefs/optional/perforce/*</include>

src/etc/poms/ant-apache-regexp/pom.xml

@@ -52,8 +52,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include>
           </includes>

src/etc/poms/ant-apache-resolver/pom.xml

@@ -52,8 +52,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/types/resolver/**</include>
           </includes>

src/etc/poms/ant-stylebook/pom.xml → src/etc/poms/ant-apache-xalan2/pom.xml

@@ -20,9 +20,8 @@
   Please contact us if you are not satisfied with the data contained in this POM.
   URL : http://ant.apache.org
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
@@ -31,9 +30,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
-  <artifactId>ant-stylebook</artifactId>
+  <artifactId>ant-apache-xalan2</artifactId>
   <version>1.8.0-SNAPSHOT</version>
-  <description>executes the Apache Stylebook document generator. Deprecated since Ant 1.7</description>
+  <description>contains the junit and junirreport tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
@@ -42,22 +41,52 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>stylebook</groupId>
-      <artifactId>stylebook</artifactId>
-      <version>1.0-b2</version>
-      <scope>provided</scope>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-nodeps</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.1</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-timestamp-file</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <mkdir dir="${project.build.outputDirectory}"/>
+                <copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
+                  <fileset dir="${project.build.sourceDirectory}/../etc">
+                    <include name="junit-frames.xsl"/>
+                    <include name="junit-noframes.xsl"/>
+                  </fileset>
+                </copy>              
+              </tasks>
+            </configuration>
+          </execution>
+
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant//taskdefs/optional/StyleBook*</include>
+            <include>org/apache/tools/ant//taskdefs/optional/Xalan2TraceSupport*</include>
           </includes>
         </configuration>
       </plugin>
@@ -68,5 +97,4 @@
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>
   </build>
-  
 </project>

src/etc/poms/ant-commons-logging/pom.xml

@@ -53,8 +53,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/tlistener/CommonsLoggingListener*</include>
           </includes>

src/etc/poms/ant-commons-net/pom.xml

@@ -53,8 +53,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/net/FTP*</include>
             <include>org/apache/tools/ant/taskdefs/optional/net/RExec*</include>

src/etc/poms/ant-jai/pom.xml

@@ -63,8 +63,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/image/*</include>
             <include>org/apache/tools/ant/types/optional/image/*</include>

src/etc/poms/ant-javamail/pom.xml

@@ -61,8 +61,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/email/MimeMailer*</include>
           </includes>

src/etc/poms/ant-jdepend/pom.xml

@@ -55,8 +55,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/optional/jdepend/*</include>
           </includes>

src/etc/poms/ant-jmf/pom.xml

@@ -54,8 +54,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/optional/sound/*</include>
           </includes>

src/etc/poms/ant-jsch/pom.xml

@@ -54,8 +54,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/optional/ssh/*</include>
           </includes>

src/etc/poms/ant-junit/pom.xml

@@ -77,8 +77,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/optional/junit/*</include>
           </includes>

src/etc/poms/ant-launcher/pom.xml

@@ -39,8 +39,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/launch/*.java</include>
           </includes>

src/etc/poms/ant-netrexx/pom.xml

@@ -54,8 +54,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/optional/NetRexxC*</include>
           </includes>

src/etc/poms/ant-nodeps/pom.xml

@@ -70,8 +70,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/**</include>
             <include>org/apache/tools/ant/types/optional/**</include>
@@ -82,23 +82,20 @@
           </includes>
           <excludes>
             <exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/junit/**</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/perforce/**</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
             <exclude>org/apache/tools/ant/util/optional/Script*</exclude>
             <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/StyleBook*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/ejb/Ejbc*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/ejb/DDCreator*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/WLRun*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/WLStop*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/Telnet*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/scm/AntStarTeam*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/starteam/*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/ANTLR*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/sound/*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>

src/etc/poms/ant-swing/pom.xml

@@ -48,8 +48,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/optional/splash/*</include>
           </includes>

src/etc/poms/ant-testutil/pom.xml

@@ -48,8 +48,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant/BuildFileTest*</include>
             <include>org/apache/tools/ant/util/regexp/RegexpMatcherTest*</include>

src/etc/poms/ant-trax/pom.xml

@@ -77,8 +77,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <includes>
             <include>org/apache/tools/ant//taskdefs/optional/TraXLiaison*</include>
           </includes>

src/etc/poms/ant/pom.xml

@@ -111,21 +111,20 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>1.4</source>
+          <target>1.4</target>
           <excludes>
             <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
             <exclude>org/apache/tools/ant/types/optional/**</exclude>
             <exclude>org/apache/tools/ant/types/resolver/**</exclude>
+            <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
             <exclude>org/apache/tools/ant/util/depend/**</exclude>
             <exclude>org/apache/tools/ant/util/optional/**</exclude>
-            <exclude>org/apache/tools/ant/util/Script*</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
-            <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
             <exclude>org/apache/tools/ant/launch/**</exclude>
           </excludes>

src/etc/poms/pom.xml

@@ -76,6 +76,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <module>ant-apache-oro</module>
     <module>ant-apache-regexp</module>
     <module>ant-apache-resolver</module>
+    <module>ant-apache-xalan2</module>
     <module>ant-commons-logging</module>
     <module>ant-commons-net</module>
     <module>ant-jai</module>
@@ -87,12 +88,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <module>ant-launcher</module>
     <module>ant-netrexx</module>
     <module>ant-nodeps</module>
-    <module>ant-starteam</module>
-    <module>ant-stylebook</module>
     <module>ant-swing</module>
     <module>ant-testutil</module>
     <module>ant-trax</module>
-    <module>ant-weblogic</module>
   </modules>
   <dependencies>
      <dependency>