This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 9f83bb2 [KARAF-6128] Upgrade to javax.annotation 1.3
new a214be5 Merge pull request #749 from jbonofre/KARAF-6128
9f83bb2 is described below
commit 9f83bb2bdca4dc992e314b67881d95cded239334
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Fri Feb 1 18:45:30 2019 +0100
[KARAF-6128] Upgrade to javax.annotation 1.3
---
assemblies/features/standard/pom.xml | 2 +-
main/src/test/resources/test-karaf-home/etc/jre.properties | 4 ++--
pom.xml | 2 +-
.../karaf-maven-plugin/src/main/resources/config.properties | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/assemblies/features/standard/pom.xml
b/assemblies/features/standard/pom.xml
index e667388..1811d58 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -36,7 +36,7 @@
<properties>
<appendedResourcesDirectory>${basedir}/../../../../etc/appended-resources</appendedResourcesDirectory>
- <javax.annotation.version>1.2</javax.annotation.version>
+ <javax.annotation.version>1.3</javax.annotation.version>
<geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
</properties>
diff --git a/main/src/test/resources/test-karaf-home/etc/jre.properties
b/main/src/test/resources/test-karaf-home/etc/jre.properties
index 5a81b2e..cb45280 100644
--- a/main/src/test/resources/test-karaf-home/etc/jre.properties
+++ b/main/src/test/resources/test-karaf-home/etc/jre.properties
@@ -352,8 +352,8 @@ jre-1.8= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.2", \
- javax.annotation.processing;version="1.2", \
+ javax.annotation;version="1.3", \
+ javax.annotation.processing;version="1.3", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
diff --git a/pom.xml b/pom.xml
index 867a4d9..4785b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
<antlr.bundle.version>2.7.7_5</antlr.bundle.version>
<asm6.version>6.2.1</asm6.version>
<asm.version>7.0</asm.version>
- <javax.annotation.version>1.2</javax.annotation.version>
+ <javax.annotation.version>1.3</javax.annotation.version>
<awaitility.version>3.1.5</awaitility.version>
<cglib.bundle.version>3.2.4_1</cglib.bundle.version>
<cglib2.version>2.2.0</cglib2.version>
diff --git a/tooling/karaf-maven-plugin/src/main/resources/config.properties
b/tooling/karaf-maven-plugin/src/main/resources/config.properties
index 2c4011a..05f6f48 100644
--- a/tooling/karaf-maven-plugin/src/main/resources/config.properties
+++ b/tooling/karaf-maven-plugin/src/main/resources/config.properties
@@ -144,8 +144,8 @@ jre-1.6= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.0", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -305,8 +305,8 @@ jre-1.7= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.2", \
- javax.annotation.processing;version="1.2", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.0", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -466,8 +466,8 @@ jre-1.8= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.2", \
- javax.annotation.processing;version="1.2", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.0", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
