You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/09/10 06:14:53 UTC

svn commit: r279944 - in /webservices/axis2/trunk/java: maven.xml modules/integration/project.xml modules/xml/maven.xml

Author: dims
Date: Fri Sep  9 21:14:48 2005
New Revision: 279944

URL: http://svn.apache.org/viewcvs?rev=279944&view=rev
Log:
- Fix test breakage in JDK1.5 (adding Xalan 2.6.0 dependency)
- move test-reports goal to root


Modified:
    webservices/axis2/trunk/java/maven.xml
    webservices/axis2/trunk/java/modules/integration/project.xml
    webservices/axis2/trunk/java/modules/xml/maven.xml

Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=279944&r1=279943&r2=279944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Fri Sep  9 21:14:48 2005
@@ -517,5 +517,19 @@
         </j:if>
 
     </postGoal>
+
+
+    <!-- ================================================================ -->
+    <!--- Create JUnit test reports -->
+    <!-- ================================================================ -->
+    <goal name="test-reports">
+      <mkdir dir="${basedir}/target/test-reports"/>
+      <ant:junitreport todir="${basedir}/target/test-reports">
+        <ant:fileset dir="${basedir}/">
+          <ant:include name="**/test-reports/TEST-*.xml"/>
+        </ant:fileset>
+        <ant:report format="frames" todir="${basedir}/target/test-reports" styledir="${basedir}/etc"/>
+      </ant:junitreport>
+    </goal>
 </project>
 

Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=279944&r1=279943&r2=279944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Fri Sep  9 21:14:48 2005
@@ -228,8 +228,16 @@
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
+            <artifactId>xmlParserAPIs</artifactId>
             <version>2.6.2</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.6.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/xml/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/maven.xml?rev=279944&r1=279943&r2=279944&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/xml/maven.xml Fri Sep  9 21:14:48 2005
@@ -16,14 +16,4 @@
             <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
         </j:if>
     </preGoal>
-
-    <goal name="test-reports">
-      <mkdir dir="${basedir}/target/test-reports"/>
-      <ant:junitreport todir="${basedir}/target/test-reports">
-        <ant:fileset dir="${basedir}/target/test-reports/">
-          <ant:include name="TEST-*.xml"/>
-        </ant:fileset>
-        <ant:report format="frames" todir="${basedir}/target/test-reports" styledir="${basedir}/../../etc"/>
-      </ant:junitreport>
-    </goal>
 </project>