Author: csierra Date: Wed Mar 1 10:05:50 2017 New Revision: 1784895 URL: http://svn.apache.org/viewvc?rev=1784895&view=rev Log: [ARIES-CDI] update to latest proposed API using OSGi snapshots
Signed-off-by: Raymond Augé <[email protected]> Removed: aries/trunk/cdi/cdi-osgi-api/bnd.bnd aries/trunk/cdi/cdi-osgi-api/pom.xml aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/CdiContainer.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/CdiEvent.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/CdiExtenderConstants.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/CdiListener.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/BundleScoped.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/MinCardinality.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/PropertyType.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/PrototypeScoped.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/Reference.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/ReferenceFilterQualifier.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/ReferenceScope.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/Service.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/ServiceProperty.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/ServicePropertyQualifier.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/annotations/package-info.java aries/trunk/cdi/cdi-osgi-api/src/main/java/org/osgi/service/cdi/package-info.java Modified: aries/trunk/cdi/cdi-extender/bnd.bnd aries/trunk/cdi/cdi-extender/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=1784895&r1=1784894&r2=1784895&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/bnd.bnd (original) +++ aries/trunk/cdi/cdi-extender/bnd.bnd Wed Mar 1 10:05:50 2017 @@ -8,6 +8,6 @@ Export-Package: org.apache.aries.cdi.pro Provide-Capability: \ osgi.extender; \ osgi.extender='osgi.cdi'; \ - uses:="org.osgi.service.cdi,javax.enterprise.inject.spi"; \ - version:Version="0.0.1" + uses:="org.osgi.service.cdi,org.osgi.service.cdi.annotations,javax.enterprise.inject.spi"; \ + version:Version="${Bundle-Version}" -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=1784895&r1=1784894&r2=1784895&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/pom.xml (original) +++ aries/trunk/cdi/cdi-extender/pom.xml Wed Mar 1 10:05:50 2017 @@ -48,11 +48,6 @@ <version>1.2</version> </dependency> <dependency> - <groupId>org.apache.aries.cdi</groupId> - <artifactId>org.apache.aries.cdi.osgi.api</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.converter</artifactId> <version>0.1-SNAPSHOT</version> @@ -74,6 +69,16 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.cdi</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.cm</artifactId> + <version>1.5.0</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.7.0</version> Modified: aries/trunk/cdi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1784895&r1=1784894&r2=1784895&view=diff ============================================================================== --- aries/trunk/cdi/pom.xml (original) +++ aries/trunk/cdi/pom.xml Wed Mar 1 10:05:50 2017 @@ -26,7 +26,6 @@ <modules> <module>cdi-log4j-configuration-fragment</module> <module>cdi-api-provider-fragment</module> - <module>cdi-osgi-api</module> <module>cdi-extender</module> <module>cdi-extension-jndi</module> <module>cdi-itests</module>
