karaf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Achim Nierbeck <bcanh...@googlemail.com>
Subject Re: karaf git commit: Revert "[KARAF-2660] adjust javax.annotation-versions to reflect those in Java SE"
Date Wed, 26 Nov 2014 15:40:04 GMT
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 <gnodet@apache.org>:

> 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 <gnodet@gmail.com>
> Authored: Wed Nov 26 16:10:19 2014 +0100
> Committer: Guillaume Nodet <gnodet@gmail.com>
> 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, \
>
>


-- 

Apache Member
Apache Karaf <http://karaf.apache.org/> Committer & PMC
OPS4J Pax Web <http://wiki.ops4j.org/display/paxweb/Pax+Web/> Committer &
Project Lead
blog <http://notizblog.nierbeck.de/>
Co-Author of Apache Karaf Cookbook <http://bit.ly/1ps9rkS>

Software Architect / Project Manager / Scrum Master

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message