On Apr 26, 2010, at 10:02 AM, Rick McGuire wrote: > On 4/26/2010 12:32 PM, David Jencks wrote: >> I merged the patch that made amq trunk work to the 5.3 branch and the result >> worked for me w/geronimo. Did you try building amq from source before >> applying this patch? I thought amq had a pretty efficient system for >> pushing snapshots but it might not be set up to build the 5.3 branch... >> > > Yes, I built from the 5.3 branch, but the latest code was still building with > the annotations-1.0 spec jar, so it was picking up with the wrong imports for > javax.annotation*. Fixing the imports to import the wider range fixed the > build problem.
Hmm. When I build amq branches 5.3 I get javax.annotation;version="[1.0,2)" in activemq-core manifest which certainly seems like it should work with 1.1, as it does for me. What do you get? BTW I expect to be starting a vote on amq 5.3.2 this afternoon. thanks david jencks > > Rick > >> thanks >> david jencks >> >> On Apr 26, 2010, at 7:59 AM, Rick McGuire wrote: >> >> >>> On 4/26/2010 8:09 AM, Rick McGuire wrote: >>> >>>> The 5.3.2 snapshot release still seems to be looking for the annotation >>>> 1.0 classes, which is breaking the trunk build. >>>> >>> This patch fixes up the activemq build so it will work with either the 1.0 >>> or 1.1 versions of the annotations. >>> >>> Rick >>> >>> >>>> Rick >>>> >>>> On 4/26/2010 2:58 AM, [email protected] wrote: >>>> >>>>> Author: djencks >>>>> Date: Mon Apr 26 06:58:38 2010 >>>>> New Revision: 937940 >>>>> >>>>> URL: http://svn.apache.org/viewvc?rev=937940&view=rev >>>>> Log: >>>>> expect a 5.3.2 release from amq >>>>> >>>>> Modified: >>>>> geronimo/server/trunk/plugins/activemq/pom.xml >>>>> >>>>> Modified: geronimo/server/trunk/plugins/activemq/pom.xml >>>>> URL: >>>>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=937940&r1=937939&r2=937940&view=diff >>>>> ============================================================================== >>>>> --- geronimo/server/trunk/plugins/activemq/pom.xml (original) >>>>> +++ geronimo/server/trunk/plugins/activemq/pom.xml Mon Apr 26 06:58:38 >>>>> 2010 >>>>> @@ -66,7 +66,7 @@ >>>>> </profiles> >>>>> >>>>> <properties> >>>>> -<activemqVersion>5.4-SNAPSHOT</activemqVersion> >>>>> +<activemqVersion>5.3.2-SNAPSHOT</activemqVersion> >>>>> </properties> >>>>> >>>>> <dependencyManagement> >>>>> >>>>> >>>>> >>>>> >>>> >>> <activemq.patch> >>> >> >> >
