Author: rotty3000 Date: Fri Sep 8 17:55:57 2017 New Revision: 1807792 URL: http://svn.apache.org/viewvc?rev=1807792&view=rev Log: [CDI] fix build and transitive dependencies on EE API artifacts (don't import these with m2e)
Signed-off-by: Raymond Augé <[email protected]> Added: aries/trunk/cdi/javax.annotation-api/ aries/trunk/cdi/javax.annotation-api/bnd.bnd aries/trunk/cdi/javax.annotation-api/pom.xml - copied, changed from r1807791, aries/trunk/cdi/javax.interceptor-api/pom.xml Modified: aries/trunk/cdi/cdi-extender/bnd.bnd aries/trunk/cdi/cdi-extender/pom.xml aries/trunk/cdi/cdi-extension-http/pom.xml aries/trunk/cdi/cdi-extension-jndi/pom.xml aries/trunk/cdi/cdi-itests/cdi-executable.bndrun aries/trunk/cdi/cdi-itests/itest.bndrun aries/trunk/cdi/cdi-itests/pom.xml aries/trunk/cdi/javax.cdi-api/pom.xml aries/trunk/cdi/javax.el-api/pom.xml aries/trunk/cdi/javax.inject-api/pom.xml aries/trunk/cdi/javax.interceptor-api/pom.xml aries/trunk/cdi/pom.xml Modified: aries/trunk/cdi/cdi-extender/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/bnd.bnd?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/bnd.bnd (original) +++ aries/trunk/cdi/cdi-extender/bnd.bnd Fri Sep 8 17:55:57 2017 @@ -16,5 +16,5 @@ Provide-Capability: \ osgi.implementation='osgi.cdi'; \ uses:="org.osgi.service.cdi,org.osgi.service.cdi.annotations,javax.enterprise.inject.spi"; \ version:Version="${Bundle-Version}" --contract: JavaCDI, JavaEL, JavaInject, JavaInterceptor +-contract: JavaAnnotation, JavaCDI, JavaEL, JavaInject, JavaInterceptor -includeresource: META-INF/=LICENSE, META-INF/=NOTICE \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/pom.xml (original) +++ aries/trunk/cdi/cdi-extender/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,12 +25,10 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>org.apache.aries.cdi.extender</artifactId> - <version>0.0.1-SNAPSHOT</version> <name>CDI Extender</name> <description>CDI Extender</description> @@ -52,8 +50,13 @@ <dependencies> <dependency> <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.javax.annotation-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.javax.cdi-api</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -78,16 +81,15 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.2_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-osgi-bundle</artifactId> <version>3.0.1.Final</version> <exclusions> <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + <exclusion> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> </exclusion> Modified: aries/trunk/cdi/cdi-extension-http/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extension-http/pom.xml (original) +++ aries/trunk/cdi/cdi-extension-http/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,7 +25,6 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.apache.aries.cdi.extension.http</artifactId> @@ -48,7 +47,7 @@ <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.javax.cdi-api</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> Modified: aries/trunk/cdi/cdi-extension-jndi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extension-jndi/pom.xml (original) +++ aries/trunk/cdi/cdi-extension-jndi/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,12 +25,10 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>org.apache.aries.cdi.extension.jndi</artifactId> - <version>0.0.1-SNAPSHOT</version> <name>CDI JNDI Extension</name> <description>CDI Extension providing JNDI support</description> @@ -47,7 +45,7 @@ <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.javax.cdi-api</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.jndi</groupId> Modified: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/cdi-executable.bndrun?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/cdi-executable.bndrun (original) +++ aries/trunk/cdi/cdi-itests/cdi-executable.bndrun Fri Sep 8 17:55:57 2017 @@ -16,11 +16,11 @@ -runbundles: \ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - javax.annotation-api;version='[1.3.0,1.3.1)',\ jboss-classfilewriter;version='[1.1.2,1.1.3)',\ org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.extension.http;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.extension.jndi;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\ org.apache.aries.javax.cdi-api;version='[0.0.1,0.0.2)',\ org.apache.aries.javax.el-api;version='[0.0.1,0.0.2)',\ org.apache.aries.javax.inject-api;version='[0.0.1,0.0.2)',\ Modified: aries/trunk/cdi/cdi-itests/itest.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/itest.bndrun (original) +++ aries/trunk/cdi/cdi-itests/itest.bndrun Fri Sep 8 17:55:57 2017 @@ -14,12 +14,12 @@ -runbundles: \ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - javax.annotation-api;version='[1.3.0,1.3.1)',\ jboss-classfilewriter;version='[1.1.2,1.1.3)',\ org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.extension.http;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.extension.jndi;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.itests;version='[0.0.1,0.0.2)',\ + org.apache.aries.javax.annotation-api;version='[0.0.1,0.0.2)',\ org.apache.aries.javax.cdi-api;version='[0.0.1,0.0.2)',\ org.apache.aries.javax.el-api;version='[0.0.1,0.0.2)',\ org.apache.aries.javax.inject-api;version='[0.0.1,0.0.2)',\ Modified: aries/trunk/cdi/cdi-itests/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/pom.xml (original) +++ aries/trunk/cdi/cdi-itests/pom.xml Fri Sep 8 17:55:57 2017 @@ -26,7 +26,6 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -116,17 +115,17 @@ <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi.extender</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi.extension.http</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi.extension.jndi</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.jndi</groupId> @@ -184,11 +183,6 @@ <version>2.0.8</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.2_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> <version>4.5.3</version> Added: aries/trunk/cdi/javax.annotation-api/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/bnd.bnd?rev=1807792&view=auto ============================================================================== --- aries/trunk/cdi/javax.annotation-api/bnd.bnd (added) +++ aries/trunk/cdi/javax.annotation-api/bnd.bnd Fri Sep 8 17:55:57 2017 @@ -0,0 +1,10 @@ +Export-Package: \ + javax.annotation;version="1.2",\ + javax.annotation.security;version="1.2",\ + javax.annotation.sql;version="1.2" +Provide-Capability: \ + osgi.contract; \ + osgi.contract=JavaAnnotation; \ + uses:="javax.annotation, javax.annotation.security, javax.annotation.sql"; \ + version:List<Version>='1,1.1,1.2' +-includeresource: @geronimo-annotation_1.2_spec-*.jar!/META-INF/LICENSE, @geronimo-annotation_1.2_spec-*.jar!/META-INF/NOTICE \ No newline at end of file Copied: aries/trunk/cdi/javax.annotation-api/pom.xml (from r1807791, aries/trunk/cdi/javax.interceptor-api/pom.xml) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/pom.xml?p2=aries/trunk/cdi/javax.annotation-api/pom.xml&p1=aries/trunk/cdi/javax.interceptor-api/pom.xml&r1=1807791&r2=1807792&rev=1807792&view=diff ============================================================================== --- aries/trunk/cdi/javax.interceptor-api/pom.xml (original) +++ aries/trunk/cdi/javax.annotation-api/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,13 +25,12 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>org.apache.aries.javax.interceptor-api</artifactId> - <name>Javax Interceptor API Bundle</name> - <description>Javax Interceptor API Bundle</description> + <artifactId>org.apache.aries.javax.annotation-api</artifactId> + <name>Javax Annotation API Bundle</name> + <description>Javax Annotation API Bundle</description> <build> <plugins> @@ -52,7 +51,7 @@ <includeDependencySources>true</includeDependencySources> <dependencySourceIncludes> - <dependencySourceInclude>org.apache.geronimo.specs:geronimo-interceptor_1.2_spec</dependencySourceInclude> + <dependencySourceInclude>org.apache.geronimo.specs:geronimo-annotation_1.2_spec</dependencySourceInclude> </dependencySourceIncludes> </configuration> </execution> @@ -64,7 +63,7 @@ <dependencies> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-interceptor_1.2_spec</artifactId> + <artifactId>geronimo-annotation_1.2_spec</artifactId> <version>1.0</version> <scope>provided</scope> </dependency> Modified: aries/trunk/cdi/javax.cdi-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/javax.cdi-api/pom.xml (original) +++ aries/trunk/cdi/javax.cdi-api/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,7 +25,6 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -85,17 +84,17 @@ <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.javax.el-api</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.javax.inject-api</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.javax.interceptor-api</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: aries/trunk/cdi/javax.el-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/javax.el-api/pom.xml (original) +++ aries/trunk/cdi/javax.el-api/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,7 +25,6 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> Modified: aries/trunk/cdi/javax.inject-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/javax.inject-api/pom.xml (original) +++ aries/trunk/cdi/javax.inject-api/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,7 +25,6 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> Modified: aries/trunk/cdi/javax.interceptor-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/javax.interceptor-api/pom.xml (original) +++ aries/trunk/cdi/javax.interceptor-api/pom.xml Fri Sep 8 17:55:57 2017 @@ -25,7 +25,6 @@ <parent> <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi</artifactId> - <version>0.0.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> Modified: aries/trunk/cdi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1807792&r1=1807791&r2=1807792&view=diff ============================================================================== --- aries/trunk/cdi/pom.xml (original) +++ aries/trunk/cdi/pom.xml Fri Sep 8 17:55:57 2017 @@ -49,6 +49,7 @@ </licenses> <modules> + <module>javax.annotation-api</module> <module>javax.el-api</module> <module>javax.inject-api</module> <module>javax.interceptor-api</module>
