Re-added junit4x to libjava/libs. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 18 Jan 2013 23:35:01 +0000
branchdevelopment
changeset 1961 5fdbb226b781
parent 1959 11cd2c406930
child 1962 cf6c15a38547
Re-added junit4x to libjava/libs. Without it stx:libjava:reports does no run, Java can't find JUnit classes. However, it should sice junit4x is also shipped with STX:LIBJAVA (see java/libs). The reason is unknown and needs further investigation.
libs/java/pom.xml
tests/build.xml
--- a/libs/java/pom.xml	Fri Jan 18 22:38:54 2013 +0000
+++ b/libs/java/pom.xml	Fri Jan 18 23:35:01 2013 +0000
@@ -57,13 +57,13 @@
 	<version>3.3.1</version>
       </dependency>
 
-      <!--
+      
       <dependency>
 	<groupId>junit</groupId>
 	<artifactId>junit</artifactId>
 	<version>4.8.2</version>
       </dependency>
-      -->
+     
 
     <dependency>
 	<groupId>org.apache.poi</groupId>
--- a/tests/build.xml	Fri Jan 18 22:38:54 2013 +0000
+++ b/tests/build.xml	Fri Jan 18 23:35:01 2013 +0000
@@ -1,18 +1,17 @@
 <project name="tests" default="build">
 
-<property name="dir.libs" value="../libs/java/libs"/>
+<property name="libraries.stx.libjava" value="../java/libs"/>
+<property name="libraries.stx.libjava.libs" value="../libs/java/libs"/>
 
 <path id="libjava-tests.classpath">
-    <fileset dir="${dir.libs}">
+    <fileset dir="${libraries.stx.libjava}">
+        <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${libraries.stx.libjava.libs}">
         <include name="**/*.jar"/>
     </fileset>
 </path>
 
-     
-    
-
-
-
   <target name="build">
 	<ant antfile="build.xml" target="build" inheritRefs="false" dir="libjava">
 	  <reference refid="libjava-tests.classpath" torefid="libjava-tests.classpath"/>