Author: csierra Date: Wed Mar 1 10:06:42 2017 New Revision: 1784897 URL: http://svn.apache.org/viewvc?rev=1784897&view=rev Log: [ARIES-CDI] simplify by embedding the inject APIs
Signed-off-by: Raymond Augé <[email protected]> Added: aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/ aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider - copied, changed from r1784896, aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider Removed: aries/trunk/cdi/cdi-api-provider-fragment/LICENSE aries/trunk/cdi/cdi-api-provider-fragment/NOTICE aries/trunk/cdi/cdi-api-provider-fragment/bnd.bnd aries/trunk/cdi/cdi-api-provider-fragment/pom.xml aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider Modified: aries/trunk/cdi/cdi-executable/cdi-executable.bndrun aries/trunk/cdi/cdi-executable/pom.xml aries/trunk/cdi/cdi-extender/bnd.bnd aries/trunk/cdi/cdi-extender/pom.xml aries/trunk/cdi/cdi-itests/itest.bndrun aries/trunk/cdi/cdi-itests/pom.xml aries/trunk/cdi/pom.xml Modified: aries/trunk/cdi/cdi-executable/cdi-executable.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/cdi-executable.bndrun?rev=1784897&r1=1784896&r2=1784897&view=diff ============================================================================== --- aries/trunk/cdi/cdi-executable/cdi-executable.bndrun (original) +++ aries/trunk/cdi/cdi-executable/cdi-executable.bndrun Wed Mar 1 10:06:42 2017 @@ -12,7 +12,6 @@ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' -runbundles: \ - javax.enterprise.cdi-api;version='[1.2.0,1.2.1)',\ jboss-classfilewriter;version='[1.1.2,1.1.3)',\ log4j;version='[1.2.17,1.2.18)',\ org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\ @@ -22,10 +21,8 @@ org.apache.felix.gogo.jline;version='[1.0.0,1.0.1)',\ org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\ org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\ - org.glassfish.hk2.external.javax.inject;version='[2.5.0,2.5.1)',\ org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\ org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec;version='[1.0.0,1.0.1)',\ - org.jboss.spec.javax.el.jboss-el-api_3.0_spec;version='[1.0.0,1.0.1)',\ org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec;version='[1.0.0,1.0.1)',\ org.jboss.weld.osgi-bundle;version='[2.4.0,2.4.1)',\ org.jline;version='[3.0.0,3.0.1)',\ Modified: aries/trunk/cdi/cdi-executable/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/pom.xml?rev=1784897&r1=1784896&r2=1784897&view=diff ============================================================================== --- aries/trunk/cdi/cdi-executable/pom.xml (original) +++ aries/trunk/cdi/cdi-executable/pom.xml Wed Mar 1 10:06:42 2017 @@ -76,11 +76,6 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.apache.aries.cdi</groupId> - <artifactId>org.apache.aries.cdi.log4j.configuration.fragment</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.apache.aries.jndi</groupId> <artifactId>org.apache.aries.jndi.api</artifactId> <version>1.1.0</version> @@ -111,11 +106,6 @@ <version>2.0.2</version> </dependency> <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - <version>2.5.0-b27</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.eclipse.equinox.metatype</artifactId> <version>1.4.100.v20150408-1437</version> Modified: aries/trunk/cdi/cdi-extender/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/bnd.bnd?rev=1784897&r1=1784896&r2=1784897&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/bnd.bnd (original) +++ aries/trunk/cdi/cdi-extender/bnd.bnd Wed Mar 1 10:06:42 2017 @@ -4,7 +4,11 @@ Conditional-Package: \ org.apache.felix.utils.extender,\ org.osgi.util.converter,\ org.osgi.util.function -Export-Package: org.apache.aries.cdi.provider;cdi-api-bundle=true;mandatory:=cdi-api-bundle +Export-Package: \ + javax.decorator,\ + javax.el,\ + javax.enterprise.*,\ + javax.inject;version='1.0.0' Provide-Capability: \ osgi.extender; \ osgi.extender='osgi.cdi'; \ Modified: aries/trunk/cdi/cdi-extender/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1784897&r1=1784896&r2=1784897&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/pom.xml (original) +++ aries/trunk/cdi/cdi-extender/pom.xml Wed Mar 1 10:06:42 2017 @@ -48,6 +48,11 @@ <version>1.2</version> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> + <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.converter</artifactId> <version>0.1.0-SNAPSHOT</version> Copied: aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider (from r1784896, aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider?p2=aries/trunk/cdi/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider&p1=aries/trunk/cdi/cdi-api-provider-fragment/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider&r1=1784896&r2=1784897&rev=1784897&view=diff ============================================================================== (empty) Modified: aries/trunk/cdi/cdi-itests/itest.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1784897&r1=1784896&r2=1784897&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/itest.bndrun (original) +++ aries/trunk/cdi/cdi-itests/itest.bndrun Wed Mar 1 10:06:42 2017 @@ -5,7 +5,6 @@ -standalone: target/index.xml -runrequires: \ - osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.api.provider.fragment)',\ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extender)',\ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extension.jndi)',\ osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.itests)',\ @@ -16,10 +15,8 @@ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' -runbundles: \ - javax.enterprise.cdi-api;version='[1.2.0,1.2.1)',\ jboss-classfilewriter;version='[1.1.2,1.1.3)',\ log4j;version='[1.2.17,1.2.18)',\ - org.apache.aries.cdi.api.provider.fragment;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.extender;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)',\ @@ -32,10 +29,8 @@ org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\ org.apache.felix.scr;version='[2.0.6,2.0.7)',\ org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\ - org.glassfish.hk2.external.javax.inject;version='[2.5.0,2.5.1)',\ org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\ org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec;version='[1.0.0,1.0.1)',\ - org.jboss.spec.javax.el.jboss-el-api_3.0_spec;version='[1.0.0,1.0.1)',\ org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec;version='[1.0.0,1.0.1)',\ org.jboss.weld.osgi-bundle;version='[2.4.0,2.4.1)',\ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\ Modified: aries/trunk/cdi/cdi-itests/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1784897&r1=1784896&r2=1784897&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/pom.xml (original) +++ aries/trunk/cdi/cdi-itests/pom.xml Wed Mar 1 10:06:42 2017 @@ -101,11 +101,6 @@ <dependency> <groupId>org.apache.aries.cdi</groupId> - <artifactId>org.apache.aries.cdi.api.provider.fragment</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.aries.cdi</groupId> <artifactId>org.apache.aries.cdi.extender</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> @@ -155,11 +150,6 @@ <version>2.0.6</version> </dependency> <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - <version>2.5.0-b27</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.eclipse.equinox.metatype</artifactId> <version>1.4.100.v20150408-1437</version> Modified: aries/trunk/cdi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1784897&r1=1784896&r2=1784897&view=diff ============================================================================== --- aries/trunk/cdi/pom.xml (original) +++ aries/trunk/cdi/pom.xml Wed Mar 1 10:06:42 2017 @@ -24,7 +24,6 @@ </licenses> <modules> - <module>cdi-api-provider-fragment</module> <module>cdi-extender</module> <module>cdi-extension-jndi</module> <module>cdi-itests</module>
