Well fixing the build by adding wrong versions is wrong I'm -1 for this revert.
We have to find a better way to fix this. sent from mobile device Am 27.11.2014 03:02 schrieb "Jean-Baptiste Onofré" <[email protected]>: > Yes, it fixes the build, and I also reverted the felix gogo runtime 0.14 > update which break the ssh itest. > > We should have a clean build soon. > > Regards > JB > > On 11/26/2014 11:53 PM, Christoph Gritschenberger wrote: > >> It's breaking the build. I submitted a pull-request to pax-cdi to >> include the missing libraries, but Harald initially disagreed with >> including 1.2-specs because only 1.1 is required. Haven't heard back >> yet. I poked again today. >> >> On 3.x, I included 1.2-annotations in the feature that is provided in >> karaf. But on master, many features depend on this, and it seemed more >> appropriate to tackle this directly in pax-cdi. >> >> kind regards, >> Christoph >> >> On 26/11/14 16:40, Achim Nierbeck wrote: >> >>> Why did you revert this? >>> afaik the annotation version included in the JDK is 1.0 so it's actually >>> missing classes if it's set to 1.1 so that is just wrong. >>> >>> regards, Achim >>> >>> 2014-11-26 16:11 GMT+01:00 <[email protected]>: >>> >>> Repository: karaf >>>> Updated Branches: >>>> refs/heads/master dc512d620 -> 1e21be1b9 >>>> >>>> >>>> Revert "[KARAF-2660] adjust javax.annotation-versions to reflect those >>>> in >>>> Java SE" >>>> >>>> This reverts commit b11ed61ff9a06fc6e0480869184d0eca33ad1cce. >>>> >>>> >>>> Project: http://git-wip-us.apache.org/repos/asf/karaf/repo >>>> Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1e21be1b >>>> Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1e21be1b >>>> Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1e21be1b >>>> >>>> Branch: refs/heads/master >>>> Commit: 1e21be1b9dd69dbfee78d3367521ffd90161db60 >>>> Parents: dc512d6 >>>> Author: Guillaume Nodet <[email protected]> >>>> Authored: Wed Nov 26 16:10:19 2014 +0100 >>>> Committer: Guillaume Nodet <[email protected]> >>>> Committed: Wed Nov 26 16:10:33 2014 +0100 >>>> >>>> ---------------------------------------------------------------------- >>>> .../filtered-resources/resources/etc/jre.properties | 12 >>>> ++++++------ >>>> 1 file changed, 6 insertions(+), 6 deletions(-) >>>> ---------------------------------------------------------------------- >>>> >>>> >>>> >>>> http://git-wip-us.apache.org/repos/asf/karaf/blob/1e21be1b/ >>>> assemblies/features/framework/src/main/filtered-resources/ >>>> resources/etc/jre.properties >>>> ---------------------------------------------------------------------- >>>> diff --git >>>> a/assemblies/features/framework/src/main/filtered- >>>> resources/resources/etc/jre.properties >>>> b/assemblies/features/framework/src/main/filtered- >>>> resources/resources/etc/jre.properties >>>> index fd48ccb..94da9db 100644 >>>> --- >>>> a/assemblies/features/framework/src/main/filtered- >>>> resources/resources/etc/jre.properties >>>> +++ >>>> b/assemblies/features/framework/src/main/filtered- >>>> resources/resources/etc/jre.properties >>>> @@ -27,8 +27,8 @@ jre-1.6= \ >>>> javax.accessibility, \ >>>> javax.activation;version="1.1", \ >>>> javax.activity, \ >>>> - javax.annotation;version="1.0", \ >>>> - javax.annotation.processing;version="1.6", \ >>>> + javax.annotation;version="1.1", \ >>>> + javax.annotation.processing;version="1.1", \ >>>> javax.crypto, \ >>>> javax.crypto.interfaces, \ >>>> javax.crypto.spec, \ >>>> @@ -190,8 +190,8 @@ jre-1.7= \ >>>> javax.accessibility, \ >>>> javax.activation;version="1.1", \ >>>> javax.activity, \ >>>> - javax.annotation;version="1.0", \ >>>> - javax.annotation.processing;version="1.6", \ >>>> + javax.annotation;version="1.1", \ >>>> + javax.annotation.processing;version="1.1", \ >>>> javax.crypto, \ >>>> javax.crypto.interfaces, \ >>>> javax.crypto.spec, \ >>>> @@ -351,8 +351,8 @@ jre-1.8= \ >>>> javax.accessibility, \ >>>> javax.activation;version="1.1", \ >>>> javax.activity, \ >>>> - javax.annotation;version="1.0", \ >>>> - javax.annotation.processing;version="1.6", \ >>>> + javax.annotation;version="1.2", \ >>>> + javax.annotation.processing;version="1.2", \ >>>> javax.crypto, \ >>>> javax.crypto.interfaces, \ >>>> javax.crypto.spec, \ >>>> >>>> >>>> >>> >>> >> >> > -- > Jean-Baptiste Onofré > [email protected] > http://blog.nanthrax.net > Talend - http://www.talend.com >
