commit 91d2a42594780c6f00aa59ea9b284f6d1682f169
author Florian Waibel <fwaibel@datenkollektiv.de> Sun Nov 03 22:30:41 2019 +0100
committer Florian Waibel <fwaibel@datenkollektiv.de> Mon Nov 18 20:18:32 2019 +0100
tree c2899db810cf78ba8edccc153cc2a454943d7f15
parent 4871d469390cd286d30d2ff5844f389b919ada86

Bump annotation-api to 1.3.2 from Maven Central

build.gradle

diff --git a/build.gradle b/build.gradle
index c77945d..d9b4576 100644
--- a/build.gradle
+++ b/build.gradle
@@ -245,7 +245,6 @@
             'OBJECTWEB.ASM'                : objectwebAsmVersion,
 
             'JAVAX.ACTIVATION'             : javaxActivationVersion,
-            'JAVAX.ANNOTATION'             : javaxAnnotationVersion,
             'JAVAX.EJB'                    : javaxEjbVersion,
             'JAVAX.INJECT'                 : javaxInjectVersion,
             'JAVAX.JMS'                    : javaxJmsVersion,
@@ -538,6 +537,7 @@
             dependency "aopalliance:aopalliance:${aopallianceVersionMaven}"
             dependency "org.aspectj:aspectjweaver:${aspectjVersion}"
 
+            dependency "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"
             dependency "javax.el:javax.el-api:${javaxElVersion}"
             dependency "javax.servlet:javax.servlet-api:${javaxServletVersion}"
             dependency "javax.servlet.jsp:javax.servlet.jsp-api:${javaxServletJspVersion}"

gradle.properties

diff --git a/gradle.properties b/gradle.properties
index b840f2d..d1bf726 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -235,7 +235,8 @@
 
 # FIXME - Gemini Web dependency is com.springsource.javax.activation-1.1.1.jar
 javaxActivationVersion = 1.1.0.v201108011116
-javaxAnnotationVersion= 1.2.0.v201401042248
+javaxAnnotationVersion= 1.3.2
+
 # CQ6093 ejb-api Version: 3.1.1
 javaxEjbVersion=3.1.1.v201204261316
 

org.eclipse.virgo.site/build.gradle

diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index 039caae..b9f335c 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -258,7 +258,7 @@
 
     signedExternalPlugin group: "javax.interceptor", name: "javax.interceptor-api", version: javaxInterceptorVersion
     signedExternalPlugin group: "javax.transaction", name: "javax.transaction-api", version: javaxTransactionVersion
-    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.annotation", version: javaxAnnotationVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin 'javax.annotation:javax.annotation-api'
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.ejb", version: javaxEjbVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin 'org.glassfish.hk2.external:javax.inject'
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.jms", version: javaxJmsVersion, configuration: "compile", ext: "jar"

packaging/build.gradle

diff --git a/packaging/build.gradle b/packaging/build.gradle
index 4e8c9c3..5d29fb9 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -25,7 +25,7 @@
 
         nanoLibPersistence project(':web:org.eclipse.virgo.web.enterprise.openejb.jpa.integration')
 
-        nanoLibEndorsed group: "org.eclipse.virgo.mirrored", name: "javax.annotation", version: javaxAnnotationVersion, configuration: "compile", ext: "jar"
+        nanoLibEndorsed 'javax.annotation:javax.annotation-api'
         nanoLibEndorsed group: "javax.interceptor", name: "javax.interceptor-api", version: javaxInterceptorVersion
         nanoLibEndorsed group: "javax.transaction", name: "javax.transaction-api", version: javaxTransactionVersion
 
@@ -134,7 +134,7 @@
         repositoryExt project(':web:org.eclipse.virgo.web.servlet.adapter')
         repositoryExt project(':web:org.eclipse.virgo.web.spring.integration')
 
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "javax.annotation", version: javaxAnnotationVersion, configuration: "compile", ext: "jar"
+        repositoryExt 'javax.annotation:javax.annotation-api'
         repositoryExt group: "org.eclipse.virgo.mirrored", name: "javax.ejb", version: javaxEjbVersion, configuration: "compile", ext: "jar"
         repositoryExt 'javax.el:javax.el-api'
         repositoryExt group: "com.sun.mail", name: "javax.mail", version: javaxMailVersion