commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Phil Steitz <phil.ste...@gmail.com>
Subject Re: svn commit: r893481 - in /commons/proper/dbcp/trunk: build.properties.sample build.xml pom-1.3.xml pom.xml src/test/org/apache/commons/dbcp/TestJOCLed.java
Date Thu, 24 Dec 2009 17:15:01 GMT
Phil Steitz wrote:
> joehni@apache.org wrote:
>> Author: joehni
>> Date: Wed Dec 23 11:44:41 2009
>> New Revision: 893481
>>
>> URL: http://svn.apache.org/viewvc?rev=893481&view=rev
>> Log:
>> Drop XML artifacts used in test and explicit selection of SAX driver.
> 
> While the maven build in trunk works only for JDK 1.6, the Ant build
> is supposed to work under 1.4-1.5.  The change below breaks this, so
>  I am going to revert it.

Ugh. Just realized / remembered that the geronimo jta spec version
breaks jdk 1.4.  I just diffed the sources (using source jars from
the m2 repo) for 1.1 vs 1.1.1 of the jta spec jar and saw no
difference.  I can't find any release notes, but from what I can
glean from the geronimo dev list archives, the only difference
between 1.1 and 1.1.1 is that 1.1.1 is packaged as an OSGi bundle.
That would explain no difference in sources. I am therefore going to
change the version in build.properties.sample and dispense with
build.properties.sample-1.3.

Phil

> 
>> Modified:
>>     commons/proper/dbcp/trunk/build.properties.sample
>>     commons/proper/dbcp/trunk/build.xml
>>     commons/proper/dbcp/trunk/pom-1.3.xml
>>     commons/proper/dbcp/trunk/pom.xml
>>     commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
>>
>> Modified: commons/proper/dbcp/trunk/build.properties.sample
>> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=893481&r1=893480&r2=893481&view=diff
>> ==============================================================================
>> --- commons/proper/dbcp/trunk/build.properties.sample (original)
>> +++ commons/proper/dbcp/trunk/build.properties.sample Wed Dec 23 11:44:41 2009
>> @@ -31,10 +31,6 @@
>>  junit.home=${repository}/junit/junit/3.8.2
>>  junit.jar=${junit.home}/junit-3.8.2.jar
>>  
>> -# XML parser
>> -xerces.home=${repository}/xerces/xercesImpl/2.4.0
>> -xerces.jar=${xerces.home}/xercesImpl-2.4.0.jar
>> -
>>  # Tomcat naming jars - needed only for JNDI tests
>>  naming.common.home=${repository}/tomcat/naming-common/5.0.28
>>  naming-common.jar=${naming.common.home}/naming-common-5.0.28.jar
>>
>> Modified: commons/proper/dbcp/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=893481&r1=893480&r2=893481&view=diff
>> ==============================================================================
>> --- commons/proper/dbcp/trunk/build.xml (original)
>> +++ commons/proper/dbcp/trunk/build.xml Wed Dec 23 11:44:41 2009
>> @@ -46,7 +46,7 @@
>>        <property name="classpath" 
>>         value="${cp}:${commons-pool.jar}:${junit.jar}:
>>          ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
>> -      	${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}:
>> +      	${jta-spec.jar}:${jta-impl.jar}:
>>        	${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
>>  
>>        <property name="name" value="commons-dbcp"/>
>> @@ -105,9 +105,6 @@
>>             <param name="file" value="${commons-logging.jar}"/>
>>         </antcall>
>>         <antcall target="check_jar">
>> -           <param name="file" value="${xerces.jar}"/>
>> -       </antcall>
>> -       <antcall target="check_jar">
>>             <param name="file" value="${jta-spec.jar}"/>
>>         </antcall>
>>         <antcall target="check_jar">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message