You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/12/14 17:35:39 UTC
svn commit: r1848961 - in /aries/trunk/cdi: ./ cdi-extender/
cdi-extender/src/main/java/org/apache/aries/cdi/container/
cdi-extension-http/
cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/
cdi-extension-jndi/ cdi-extension-jndi/src...
Author: rotty3000
Date: Fri Dec 14 17:35:38 2018
New Revision: 1848961
URL: http://svn.apache.org/viewvc?rev=1848961&view=rev
Log:
[CDI] restructure
Signed-off-by: Raymond Auge <ro...@apache.org>
Added:
aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/package-info.java
aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/package-info.java
Modified:
aries/trunk/cdi/cdi-extender/pom.xml
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
aries/trunk/cdi/cdi-extension-http/pom.xml
aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java
aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
aries/trunk/cdi/cdi-extension-jndi/pom.xml
aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java
aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java
aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtensionFactory.java
aries/trunk/cdi/cdi-extra/pom.xml
aries/trunk/cdi/cdi-itests/pom.xml
aries/trunk/cdi/pom.xml
Modified: aries/trunk/cdi/cdi-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/pom.xml (original)
+++ aries/trunk/cdi/cdi-extender/pom.xml Fri Dec 14 17:35:38 2018
@@ -41,151 +41,72 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.1</version>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.1</version>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-osgi-bundle</artifactId>
- <version>${weld.release}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_3.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.2_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.bundle</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
+ <artifactId>osgi.annotation</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.implementation</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
- <version>1.0.0</version>
- <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.6.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.converter</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -209,7 +130,18 @@
<dependency>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi.extra</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.13.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -224,12 +156,6 @@
<version>1.7.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.13.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java Fri Dec 14 17:35:38 2018
@@ -42,7 +42,6 @@
namespace = ServiceNamespace.SERVICE_NAMESPACE,
attribute = "objectClass:List<String>=javax.enterprise.inject.spi.BeanManager",
uses = {
- javax.el.Expression.class,
javax.enterprise.context.ApplicationScoped.class,
javax.enterprise.context.spi.Context.class,
javax.enterprise.event.Event.class,
Modified: aries/trunk/cdi/cdi-extension-http/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/pom.xml?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/pom.xml (original)
+++ aries/trunk/cdi/cdi-extension-http/pom.xml Fri Dec 14 17:35:38 2018
@@ -30,7 +30,7 @@
<name>Aries CDI Http Extension</name>
<description>
Provides support to CDI bundles for http servlet scopes; @RequestScoped,
- @ApplicationScoped, @SessionScoped and @ConversationScoped.
+ @SessionScoped and @ConversationScoped.
</description>
<build>
@@ -52,19 +52,20 @@
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.1</version>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -74,12 +75,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.1.2</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
@@ -87,56 +82,36 @@
<version>2.3.3</version>
</dependency>
<dependency>
- <groupId>org.jboss.weld.module</groupId>
- <artifactId>weld-web</artifactId>
- <version>${weld.release}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.bundle</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.implementation</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
- <version>1.0.0</version>
- <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.http.whiteboard</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java (original)
+++ aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java Fri Dec 14 17:35:38 2018
@@ -14,76 +14,33 @@
package org.apache.aries.cdi.extension.http;
+import static org.osgi.framework.Constants.BUNDLE_ACTIVATOR;
+import static org.osgi.framework.Constants.SERVICE_DESCRIPTION;
+import static org.osgi.framework.Constants.SERVICE_VENDOR;
+import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
+
import java.util.Dictionary;
import java.util.Hashtable;
import javax.enterprise.inject.spi.Extension;
-import org.osgi.annotation.bundle.Capability;
import org.osgi.annotation.bundle.Header;
-import org.osgi.annotation.bundle.Requirement;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.namespace.implementation.ImplementationNamespace;
-import org.osgi.namespace.service.ServiceNamespace;
-import org.osgi.service.cdi.CDIConstants;
-import org.osgi.service.cdi.annotations.RequireCDIImplementation;
-
-@Capability(
- attribute = "objectClass:List<String>=javax.enterprise.inject.spi.Extension",
- namespace = ServiceNamespace.SERVICE_NAMESPACE,
- uses= {
- javax.annotation.Priority.class,
- javax.enterprise.context.Initialized.class,
- javax.enterprise.event.Observes.class,
- javax.enterprise.inject.spi.Extension.class,
- javax.naming.Context.class,
- javax.naming.spi.ObjectFactory.class,
- javax.servlet.ServletContextListener.class,
- javax.servlet.http.HttpSessionListener.class,
- org.jboss.weld.module.web.servlet.WeldInitialListener.class,
- org.osgi.service.cdi.CDIConstants.class,
- org.osgi.service.http.whiteboard.HttpWhiteboardConstants.class,
- }
-)
-@Capability(
- name = "aries.cdi.http",
- namespace = CDIConstants.CDI_EXTENSION_PROPERTY,
- uses= {
- javax.annotation.Priority.class,
- javax.enterprise.context.Initialized.class,
- javax.enterprise.event.Observes.class,
- javax.enterprise.inject.spi.Extension.class,
- javax.naming.Context.class,
- javax.naming.spi.ObjectFactory.class,
- javax.servlet.ServletContextListener.class,
- javax.servlet.http.HttpSessionListener.class,
- org.jboss.weld.module.web.servlet.WeldInitialListener.class,
- org.osgi.service.cdi.CDIConstants.class,
- org.osgi.service.http.whiteboard.HttpWhiteboardConstants.class,
- },
- version = "0.0.2"
-)
+
@Header(
- name = Constants.BUNDLE_ACTIVATOR,
+ name = BUNDLE_ACTIVATOR,
value = "${@class}"
)
-@Requirement(
- name = "osgi.http",
- namespace = ImplementationNamespace.IMPLEMENTATION_NAMESPACE,
- version = "1.0.0"
-)
-@RequireCDIImplementation
public class HttpActivator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
Dictionary<String, Object> properties = new Hashtable<>();
- properties.put(CDIConstants.CDI_EXTENSION_PROPERTY, "aries.cdi.http");
- properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - HTTP Portable Extension Factory");
- properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
+ properties.put(CDI_EXTENSION_PROPERTY, "aries.cdi.http");
+ properties.put(SERVICE_DESCRIPTION, "Aries CDI - HTTP Portable Extension Factory");
+ properties.put(SERVICE_VENDOR, "Apache Software Foundation");
_serviceRegistration = context.registerService(
Extension.class, new HttpExtensionFactory(), properties);
Modified: aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java (original)
+++ aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java Fri Dec 14 17:35:38 2018
@@ -14,8 +14,14 @@
package org.apache.aries.cdi.extension.http;
+import static javax.interceptor.Interceptor.Priority.LIBRARY_AFTER;
+import static org.osgi.framework.Constants.SERVICE_DESCRIPTION;
+import static org.osgi.framework.Constants.SERVICE_RANKING;
+import static org.osgi.framework.Constants.SERVICE_VENDOR;
import static org.osgi.namespace.extender.ExtenderNamespace.EXTENDER_NAMESPACE;
import static org.osgi.service.cdi.CDIConstants.CDI_CAPABILITY_NAME;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER;
import java.util.Collections;
import java.util.Dictionary;
@@ -41,14 +47,12 @@ import javax.servlet.http.HttpSessionLis
import org.jboss.weld.module.web.el.WeldELContextListener;
import org.jboss.weld.module.web.servlet.WeldInitialListener;
import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.wiring.BundleCapability;
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
public class HttpExtension implements Extension {
@@ -56,17 +60,19 @@ public class HttpExtension implements Ex
_bundle = bundle;
}
+ // TODO process javax.servlet.annotations annotations
+
void afterDeploymentValidation(
- @Observes @Priority(javax.interceptor.Interceptor.Priority.LIBRARY_AFTER+800)
+ @Observes @Priority(LIBRARY_AFTER + 800)
AfterDeploymentValidation adv, BeanManager beanManager) {
Dictionary<String, Object> properties = new Hashtable<>();
- properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - HTTP Portable Extension");
- properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
- properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, getSelectedContext());
- properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER, Boolean.TRUE.toString());
- properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE - 100);
+ properties.put(SERVICE_DESCRIPTION, "Aries CDI - HTTP Portable Extension");
+ properties.put(SERVICE_VENDOR, "Apache Software Foundation");
+ properties.put(HTTP_WHITEBOARD_CONTEXT_SELECT, getSelectedContext());
+ properties.put(HTTP_WHITEBOARD_LISTENER, Boolean.TRUE.toString());
+ properties.put(SERVICE_RANKING, Integer.MAX_VALUE - 100);
AnnotatedType<WeldInitialListener> annotatedType = beanManager.createAnnotatedType(WeldInitialListener.class);
InjectionTargetFactory<WeldInitialListener> injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType);
@@ -78,7 +84,7 @@ public class HttpExtension implements Ex
LISTENER_CLASSES, initialListener, properties);
properties.put(
- Constants.SERVICE_DESCRIPTION, "Aries CDI - ELResolver Servlet Context Listener");
+ SERVICE_DESCRIPTION, "Aries CDI - ELResolver Servlet Context Listener");
_elAdaptorRegistration = _bundle.getBundleContext().registerService(
ServletContextListener.class,
@@ -160,8 +166,8 @@ public class HttpExtension implements Ex
private String getSelectedContext0() {
Map<String, Object> attributes = getAttributes();
- if (attributes.containsKey(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT)) {
- return (String)attributes.get(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT);
+ if (attributes.containsKey(HTTP_WHITEBOARD_CONTEXT_SELECT)) {
+ return (String)attributes.get(HTTP_WHITEBOARD_CONTEXT_SELECT);
}
Dictionary<String,String> headers = _bundle.getHeaders();
Added: aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/package-info.java?rev=1848961&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/package-info.java (added)
+++ aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/package-info.java Fri Dec 14 17:35:38 2018
@@ -0,0 +1,43 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@org.osgi.annotation.bundle.Capability(
+ attribute = "objectClass:List<String>=javax.enterprise.inject.spi.Extension",
+ namespace = SERVICE_NAMESPACE
+)
+@org.osgi.annotation.bundle.Capability(
+ name = "aries.cdi.http",
+ namespace = CDI_EXTENSION_PROPERTY,
+ uses= {
+ javax.annotation.Priority.class,
+ javax.enterprise.context.spi.Context.class,
+ javax.enterprise.event.Observes.class,
+ javax.enterprise.inject.spi.Extension.class,
+ javax.servlet.ServletContextListener.class,
+ javax.servlet.http.HttpSessionListener.class
+ },
+ version = "1.0.0"
+)
+//Deliberately depend on Http Whiteboard version 1.0.0 (the spec annotation starts at 1.1.0)
+@org.osgi.annotation.bundle.Requirement(
+ name = "osgi.http",
+ namespace = IMPLEMENTATION_NAMESPACE,
+ version = "1.0.0"
+)
+@org.osgi.service.cdi.annotations.RequireCDIImplementation
+package org.apache.aries.cdi.extension.http;
+
+import static org.osgi.namespace.implementation.ImplementationNamespace.IMPLEMENTATION_NAMESPACE;
+import static org.osgi.namespace.service.ServiceNamespace.SERVICE_NAMESPACE;
+import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
Modified: aries/trunk/cdi/cdi-extension-jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/pom.xml?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/pom.xml (original)
+++ aries/trunk/cdi/cdi-extension-jndi/pom.xml Fri Dec 14 17:35:38 2018
@@ -41,57 +41,46 @@
<dependencies>
<dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.api</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.api</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.bundle</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
- <version>1.0.0</version>
- <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.log</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java (original)
+++ aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java Fri Dec 14 17:35:38 2018
@@ -14,61 +14,29 @@
package org.apache.aries.cdi.extension.jndi;
+import static org.osgi.framework.Constants.BUNDLE_ACTIVATOR;
+import static org.osgi.framework.Constants.SERVICE_DESCRIPTION;
+import static org.osgi.framework.Constants.SERVICE_VENDOR;
+import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
+import static org.osgi.service.jndi.JNDIConstants.JNDI_URLSCHEME;
+
import java.util.Dictionary;
import java.util.Hashtable;
import javax.enterprise.inject.spi.Extension;
import javax.naming.spi.ObjectFactory;
-import org.osgi.annotation.bundle.Capability;
import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.namespace.service.ServiceNamespace;
-import org.osgi.service.cdi.CDIConstants;
-import org.osgi.service.cdi.annotations.RequireCDIImplementation;
-import org.osgi.service.jndi.JNDIConstants;
import org.osgi.service.log.LoggerFactory;
import org.osgi.util.tracker.ServiceTracker;
-@Capability(
- attribute = "objectClass:List<String>=javax.enterprise.inject.spi.Extension",
- namespace = ServiceNamespace.SERVICE_NAMESPACE,
- uses= {
- javax.enterprise.context.Initialized.class,
- javax.enterprise.event.Observes.class,
- javax.enterprise.inject.spi.Extension.class,
- javax.naming.Context.class,
- javax.naming.spi.ObjectFactory.class,
- org.osgi.service.cdi.CDIConstants.class,
- org.osgi.service.jndi.JNDIConstants.class,
- org.osgi.service.log.LoggerFactory.class,
- org.osgi.util.promise.Promise.class
- }
-)
-@Capability(
- namespace = CDIConstants.CDI_EXTENSION_PROPERTY,
- name = "aries.cdi.jndi",
- uses= {
- javax.enterprise.context.Initialized.class,
- javax.enterprise.event.Observes.class,
- javax.enterprise.inject.spi.Extension.class,
- javax.naming.Context.class,
- javax.naming.spi.ObjectFactory.class,
- org.osgi.service.cdi.CDIConstants.class,
- org.osgi.service.jndi.JNDIConstants.class,
- org.osgi.service.log.LoggerFactory.class,
- org.osgi.util.promise.Promise.class
- },
- version = "0.0.2"
-)
@Header(
- name = Constants.BUNDLE_ACTIVATOR,
+ name = BUNDLE_ACTIVATOR,
value = "${@class}"
)
-@RequireCDIImplementation
public class JndiActivator implements BundleActivator {
@Override
@@ -77,10 +45,10 @@ public class JndiActivator implements Bu
_lft.open();
Dictionary<String, Object> properties = new Hashtable<>();
- properties.put(CDIConstants.CDI_EXTENSION_PROPERTY, "aries.cdi.jndi");
- properties.put(JNDIConstants.JNDI_URLSCHEME, "java");
- properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - JNDI Portable Extension Factory");
- properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
+ properties.put(CDI_EXTENSION_PROPERTY, "aries.cdi.jndi");
+ properties.put(JNDI_URLSCHEME, "java");
+ properties.put(SERVICE_DESCRIPTION, "Aries CDI - JNDI Portable Extension Factory");
+ properties.put(SERVICE_VENDOR, "Apache Software Foundation");
_serviceRegistration = context.registerService(
new String[] {Extension.class.getName(), ObjectFactory.class.getName()},
@@ -94,7 +62,6 @@ public class JndiActivator implements Bu
}
private volatile ServiceTracker<LoggerFactory, LoggerFactory> _lft;
- @SuppressWarnings("rawtypes")
- private ServiceRegistration _serviceRegistration;
+ private ServiceRegistration<?> _serviceRegistration;
}
Modified: aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java (original)
+++ aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java Fri Dec 14 17:35:38 2018
@@ -14,6 +14,8 @@
package org.apache.aries.cdi.extension.jndi;
+import static javax.interceptor.Interceptor.Priority.LIBRARY_AFTER;
+
import java.util.Hashtable;
import javax.annotation.Priority;
@@ -47,7 +49,7 @@ public class JndiExtension implements Ex
}
void applicationScopedInitialized(
- @Observes @Priority(javax.interceptor.Interceptor.Priority.LIBRARY_AFTER+800)
+ @Observes @Priority(LIBRARY_AFTER + 800)
AfterDeploymentValidation adv, BeanManager beanManager) {
_beanManager.resolve(beanManager);
Modified: aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtensionFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtensionFactory.java?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtensionFactory.java (original)
+++ aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtensionFactory.java Fri Dec 14 17:35:38 2018
@@ -20,21 +20,20 @@ import org.osgi.framework.ServiceRegistr
import org.osgi.service.log.Logger;
import org.osgi.service.log.LoggerFactory;
-@SuppressWarnings("rawtypes")
-public class JndiExtensionFactory implements PrototypeServiceFactory {
+public class JndiExtensionFactory implements PrototypeServiceFactory<Object> {
public JndiExtensionFactory(LoggerFactory loggerFactory) {
_loggerFactory = loggerFactory;
}
@Override
- public Object getService(Bundle bundle, ServiceRegistration registration) {
+ public Object getService(Bundle bundle, ServiceRegistration<Object> registration) {
return new JndiExtension(_loggerFactory.getLogger(bundle, JndiContext.class.getName(), Logger.class));
}
@Override
public void ungetService(
- Bundle bundle, ServiceRegistration registration, Object extension) {
+ Bundle bundle, ServiceRegistration<Object> registration, Object extension) {
}
private final LoggerFactory _loggerFactory;
Added: aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/package-info.java?rev=1848961&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/package-info.java (added)
+++ aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/package-info.java Fri Dec 14 17:35:38 2018
@@ -0,0 +1,38 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@Capability(
+ attribute = "objectClass:List<String>=javax.enterprise.inject.spi.Extension",
+ namespace = SERVICE_NAMESPACE
+)
+@Capability(
+ namespace = CDI_EXTENSION_PROPERTY,
+ name = "aries.cdi.jndi",
+ uses= {
+ javax.annotation.Priority.class,
+ javax.enterprise.event.Observes.class,
+ javax.enterprise.inject.spi.Extension.class,
+ javax.naming.Context.class,
+ javax.naming.spi.ObjectFactory.class
+ },
+ version = "1.0.0"
+)
+@RequireCDIImplementation
+package org.apache.aries.cdi.extension.jndi;
+
+import static org.osgi.namespace.service.ServiceNamespace.SERVICE_NAMESPACE;
+import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
+
+import org.osgi.annotation.bundle.Capability;
+import org.osgi.service.cdi.annotations.RequireCDIImplementation;
Modified: aries/trunk/cdi/cdi-extra/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/pom.xml?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/pom.xml (original)
+++ aries/trunk/cdi/cdi-extra/pom.xml Fri Dec 14 17:35:38 2018
@@ -45,8 +45,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.1.2</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -56,20 +54,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
- <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.namespace.service</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -80,7 +69,8 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.1.0</version>
+ <!-- Deliberately overridden since version 1.0.0 doesn't contain the annotations. -->
+ <version>1.1.0</version><!--$NO-MVN-MAN-VER$-->
<scope>provided</scope>
</dependency>
<dependency>
@@ -91,9 +81,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: aries/trunk/cdi/cdi-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Fri Dec 14 17:35:38 2018
@@ -35,63 +35,6 @@
<maven.install.skip>true</maven.install.skip>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <includeClassesDir>false</includeClassesDir>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <includes>
- <include>META-INF/*</include>
- <include>org/apache/aries/cdi/test/cases/*</include>
- <include>org/apache/aries/cdi/test/interfaces/*</include>
- <include>*.jar</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-resolver-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- <bndrun>cdi-executable.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-testing-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-export-maven-plugin</artifactId>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>cdi-executable.bndrun</bndrun>
- </bndruns>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- COMPILE -->
<dependency>
@@ -112,7 +55,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -122,38 +64,24 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.0</version>
</dependency>
<!-- PROVIDED -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.bundle</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <version>1.6.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -164,14 +92,18 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
- <scope>provided</scope>
</dependency>
<!-- RUNTIME -->
@@ -202,13 +134,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -318,4 +248,56 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <configuration>
+ <includeClassesDir>false</includeClassesDir>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>META-INF/*</include>
+ <include>org/apache/aries/cdi/test/cases/*</include>
+ <include>org/apache/aries/cdi/test/interfaces/*</include>
+ <include>*.jar</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <configuration>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ <bndrun>cdi-executable.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-testing-maven-plugin</artifactId>
+ <configuration>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-export-maven-plugin</artifactId>
+ <configuration>
+ <bndruns>
+ <bndrun>cdi-executable.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: aries/trunk/cdi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1848961&r1=1848960&r2=1848961&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Fri Dec 14 17:35:38 2018
@@ -31,6 +31,7 @@
<name>CDI Integration Project</name>
<version>0.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
+
<properties>
<bnd.version>4.1.0</bnd.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,6 +54,165 @@
<module>cdi-itests</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.11.0</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
+ <version>${weld.release}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_3.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.namespace.extender</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.namespace.implementation</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.namespace.service</artifactId>
+ <version>1.0.0</version>
+ <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.6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.converter</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>7.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
<id>apache-release</id>
@@ -122,6 +282,10 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-export-maven-plugin</artifactId>
<version>${bnd.version}</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>false</resolve>
+ </configuration>
<executions>
<execution>
<id>export</id>
@@ -149,6 +313,7 @@
<artifactId>bnd-resolver-maven-plugin</artifactId>
<version>${bnd.version}</version>
<configuration>
+ <failOnChanges>false</failOnChanges>
<includeOptional>false</includeOptional>
</configuration>
<executions>
@@ -165,6 +330,10 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
<version>${bnd.version}</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>false</resolve>
+ </configuration>
<executions>
<execution>
<id>testing</id>