diff --git a/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml b/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml index 89630fb46a..6c81e95902 100644 --- a/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml +++ b/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml @@ -53,6 +53,11 @@ org.apache.felix.scr.ds-annotations provided + + javax.xml.bind + jaxb-api + compile + diff --git a/components/data-bridge/org.wso2.carbon.databridge.agent/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.agent/pom.xml index 54dd63b7f0..0cc55086e6 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.agent/pom.xml +++ b/components/data-bridge/org.wso2.carbon.databridge.agent/pom.xml @@ -35,11 +35,11 @@ - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi.services @@ -114,6 +114,11 @@ 2.24.3 test + + javax.xml.bind + jaxb-api + compile + diff --git a/components/data-bridge/org.wso2.carbon.databridge.commons.thrift/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.commons.thrift/pom.xml index bc48dfd281..118ff869e8 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.commons.thrift/pom.xml +++ b/components/data-bridge/org.wso2.carbon.databridge.commons.thrift/pom.xml @@ -35,7 +35,7 @@ - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi diff --git a/components/data-bridge/org.wso2.carbon.databridge.commons/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.commons/pom.xml index 256f6d98e6..09db3d19ad 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.commons/pom.xml +++ b/components/data-bridge/org.wso2.carbon.databridge.commons/pom.xml @@ -36,7 +36,7 @@ - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi @@ -78,7 +78,7 @@ org.apache.felix maven-bundle-plugin - + 5.1.9 true diff --git a/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml index 234ca41d03..174d9c571f 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml +++ b/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml @@ -34,7 +34,7 @@ - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi @@ -93,6 +93,11 @@ org.apache.felix.scr.ds-annotations provided + + javax.xml.bind + jaxb-api + compile + @@ -124,6 +129,10 @@ org.osgi.framework,*;resolution:=optional * + + osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeSubscriberService, + osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeReceiverService + diff --git a/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml index dc73e26c07..cfc8c4b0ce 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml +++ b/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml @@ -35,7 +35,7 @@ - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi diff --git a/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml index a9881aebf1..b02fd1883c 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml +++ b/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml @@ -35,7 +35,7 @@ - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi diff --git a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml index f0df6fcad4..4c41c8d947 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml +++ b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml @@ -37,7 +37,7 @@ org.wso2.carbon.databridge.core - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi diff --git a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/src/main/java/org/wso2/carbon/databridge/streamdefn/filesystem/FileSystemStreamDefinitionStore.java b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/src/main/java/org/wso2/carbon/databridge/streamdefn/filesystem/FileSystemStreamDefinitionStore.java index e3f2fd9344..e04fd65bfa 100644 --- a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/src/main/java/org/wso2/carbon/databridge/streamdefn/filesystem/FileSystemStreamDefinitionStore.java +++ b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/src/main/java/org/wso2/carbon/databridge/streamdefn/filesystem/FileSystemStreamDefinitionStore.java @@ -19,6 +19,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.osgi.annotation.bundle.Capability; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.databridge.commons.StreamDefinition; import org.wso2.carbon.databridge.core.definitionstore.AbstractStreamDefinitionStore; @@ -31,6 +32,13 @@ import java.util.Collection; +@Capability( + namespace = "osgi.service", + attribute = { + "objectClass=org.wso2.carbon.databridge.core.definitionstore.AbstractStreamDefinitionStore", + "service.scope=singleton" + } +) public class FileSystemStreamDefinitionStore extends AbstractStreamDefinitionStore { private static final Log log = LogFactory.getLog(FileSystemStreamDefinitionStore.class); diff --git a/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml b/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml index 7c051cc29d..8010b9f414 100644 --- a/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml +++ b/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml @@ -63,6 +63,14 @@ org.apache.felix.scr.ds-annotations provided + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + diff --git a/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/src/main/java/org/wso2/carbon/event/processor/manager/core/internal/CarbonEventManagementService.java b/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/src/main/java/org/wso2/carbon/event/processor/manager/core/internal/CarbonEventManagementService.java index b7101e5442..e7cb86f5f3 100644 --- a/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/src/main/java/org/wso2/carbon/event/processor/manager/core/internal/CarbonEventManagementService.java +++ b/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/src/main/java/org/wso2/carbon/event/processor/manager/core/internal/CarbonEventManagementService.java @@ -19,6 +19,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.osgi.annotation.bundle.Capability; import org.wso2.carbon.databridge.commons.Event; import org.wso2.carbon.event.processor.manager.core.EventManagementService; import org.wso2.carbon.event.processor.manager.core.EventProcessorManagementService; @@ -45,6 +46,13 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; +@Capability( + namespace = "osgi.service", + attribute = { + "objectClass=org.wso2.carbon.event.processor.manager.core.EventManagementService", + "service.scope=singleton" + } +) public class CarbonEventManagementService implements EventManagementService { private static Log log = LogFactory.getLog(CarbonEventManagementService.class); diff --git a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.websocket.local/org.wso2.carbon.event.output.adapter.websocket.endpoint/pom.xml b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.websocket.local/org.wso2.carbon.event.output.adapter.websocket.endpoint/pom.xml index 7a41c71d87..5e056b0048 100644 --- a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.websocket.local/org.wso2.carbon.event.output.adapter.websocket.endpoint/pom.xml +++ b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.websocket.local/org.wso2.carbon.event.output.adapter.websocket.endpoint/pom.xml @@ -54,5 +54,15 @@ outputwebsocket + + + maven-compiler-plugin + + + org.apache.maven.plugins + maven-war-plugin + 3.5.0 + + diff --git a/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml b/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml index 519e9bea4b..ddf27910a3 100644 --- a/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml +++ b/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml @@ -34,6 +34,14 @@ http://wso2.org + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + org.wso2.carbon org.wso2.carbon.core @@ -73,6 +81,11 @@ log4j-core test + + javax.xml.bind + jaxb-api + compile + diff --git a/components/event-publisher/org.wso2.carbon.event.output.adapter.core/src/main/java/org/wso2/carbon/event/output/adapter/core/internal/CarbonOutputEventAdapterService.java b/components/event-publisher/org.wso2.carbon.event.output.adapter.core/src/main/java/org/wso2/carbon/event/output/adapter/core/internal/CarbonOutputEventAdapterService.java index ae3cff0ff5..2d26b3cbae 100644 --- a/components/event-publisher/org.wso2.carbon.event.output.adapter.core/src/main/java/org/wso2/carbon/event/output/adapter/core/internal/CarbonOutputEventAdapterService.java +++ b/components/event-publisher/org.wso2.carbon.event.output.adapter.core/src/main/java/org/wso2/carbon/event/output/adapter/core/internal/CarbonOutputEventAdapterService.java @@ -33,6 +33,13 @@ /** * EventAdapter service implementation. */ +@org.osgi.annotation.bundle.Capability( + namespace = "osgi.service", + attribute = { + "objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService", + "service.scope=singleton" + } +) public class CarbonOutputEventAdapterService implements OutputEventAdapterService { private static Log log = LogFactory.getLog(CarbonOutputEventAdapterService.class); diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml b/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml index dfd02b48e1..3d168fe9a7 100644 --- a/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml +++ b/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml @@ -78,6 +78,14 @@ org.wso2.securevault provided + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.core/src/main/java/org/wso2/carbon/event/publisher/core/internal/CarbonEventPublisherService.java b/components/event-publisher/org.wso2.carbon.event.publisher.core/src/main/java/org/wso2/carbon/event/publisher/core/internal/CarbonEventPublisherService.java index 768ae36cb6..c4b6fbd75d 100644 --- a/components/event-publisher/org.wso2.carbon.event.publisher.core/src/main/java/org/wso2/carbon/event/publisher/core/internal/CarbonEventPublisherService.java +++ b/components/event-publisher/org.wso2.carbon.event.publisher.core/src/main/java/org/wso2/carbon/event/publisher/core/internal/CarbonEventPublisherService.java @@ -21,6 +21,7 @@ import org.apache.axis2.util.XMLUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.osgi.annotation.bundle.Capability; import org.w3c.dom.Document; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.databridge.commons.StreamDefinition; @@ -59,6 +60,13 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.stream.XMLStreamException; +@Capability( + namespace = "osgi.service", + attribute = { + "objectClass=org.wso2.carbon.event.publisher.core.EventPublisherService", + "service.scope=singleton" + } +) public class CarbonEventPublisherService implements EventPublisherService { private static final Log log = LogFactory.getLog(CarbonEventPublisherService.class); diff --git a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.websocket.local/org.wso2.carbon.event.input.adapter.websocket.endpoint/pom.xml b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.websocket.local/org.wso2.carbon.event.input.adapter.websocket.endpoint/pom.xml index 98aee7e243..41d03206f5 100644 --- a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.websocket.local/org.wso2.carbon.event.input.adapter.websocket.endpoint/pom.xml +++ b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.websocket.local/org.wso2.carbon.event.input.adapter.websocket.endpoint/pom.xml @@ -60,5 +60,15 @@ inputwebsocket + + + maven-compiler-plugin + + + org.apache.maven.plugins + maven-war-plugin + 3.5.0 + + diff --git a/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml b/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml index 42e99bc3af..e177b384b7 100644 --- a/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml +++ b/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml @@ -47,6 +47,11 @@ org.apache.felix.scr.ds-annotations provided + + javax.xml.bind + jaxb-api + compile + @@ -74,6 +79,9 @@ *;resolution:=optional * + + osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterService + diff --git a/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml b/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml index 94347e026b..6634829b3f 100644 --- a/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml +++ b/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml @@ -121,6 +121,9 @@ *;resolution:=optional * + + osgi.service;objectClass=org.wso2.carbon.event.receiver.core.EventReceiverService + EventReceiverDeployer org.wso2.carbon.event.receiver.core.EventReceiverService diff --git a/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml b/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml index 7bbd5804dc..7845df7361 100644 --- a/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml +++ b/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml @@ -69,6 +69,19 @@ org.apache.felix.scr.ds-annotations provided + + org.eclipse.platform + org.eclipse.osgi + + + org.eclipse.platform + org.eclipse.osgi.services + + + javax.xml.bind + jaxb-api + compile + diff --git a/components/event-stream/org.wso2.carbon.event.stream.core/src/main/java/org/wso2/carbon/event/stream/core/internal/CarbonEventStreamService.java b/components/event-stream/org.wso2.carbon.event.stream.core/src/main/java/org/wso2/carbon/event/stream/core/internal/CarbonEventStreamService.java index 48f1c8289c..a41541efb3 100644 --- a/components/event-stream/org.wso2.carbon.event.stream.core/src/main/java/org/wso2/carbon/event/stream/core/internal/CarbonEventStreamService.java +++ b/components/event-stream/org.wso2.carbon.event.stream.core/src/main/java/org/wso2/carbon/event/stream/core/internal/CarbonEventStreamService.java @@ -20,6 +20,7 @@ import org.apache.axis2.engine.AxisConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.osgi.annotation.bundle.Capability; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils; @@ -49,6 +50,13 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +@Capability( + namespace = "osgi.service", + attribute = { + "objectClass=org.wso2.carbon.event.stream.core.EventStreamService", + "service.scope=singleton" + } +) public class CarbonEventStreamService implements EventStreamService { private static final Log log = LogFactory.getLog(CarbonEventStreamService.class); diff --git a/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml b/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml index 80bbffd5ea..39b1d3e76c 100644 --- a/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml +++ b/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml @@ -71,6 +71,11 @@ org.apache.felix.scr.ds-annotations provided + + javax.xml.bind + jaxb-api + compile + diff --git a/features/analytics-dashboard/org.wso2.carbon.analytics.dashboard.feature/pom.xml b/features/analytics-dashboard/org.wso2.carbon.analytics.dashboard.feature/pom.xml index 12f5d4c0ee..965b4d208a 100644 --- a/features/analytics-dashboard/org.wso2.carbon.analytics.dashboard.feature/pom.xml +++ b/features/analytics-dashboard/org.wso2.carbon.analytics.dashboard.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.feature/pom.xml b/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.feature/pom.xml index 42a1452342..bfc725646d 100644 --- a/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.feature/pom.xml +++ b/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.feature/pom.xml @@ -51,6 +51,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.server.feature/pom.xml b/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.server.feature/pom.xml index dcb241e43a..0f50b83ab7 100644 --- a/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.server.feature/pom.xml +++ b/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.server.feature/pom.xml @@ -56,6 +56,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.ui.feature/pom.xml b/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.ui.feature/pom.xml index c23eff58ec..35a1960bcd 100644 --- a/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.ui.feature/pom.xml +++ b/features/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.ui.feature/pom.xml @@ -49,6 +49,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.batch.provider.template.feature/pom.xml b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.batch.provider.template.feature/pom.xml index 71fb51979d..af8e75e9ff 100644 --- a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.batch.provider.template.feature/pom.xml +++ b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.batch.provider.template.feature/pom.xml @@ -94,7 +94,8 @@ org.wso2.maven carbon-p2-plugin - 1.5.3 + ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.chart.template.feature/pom.xml b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.chart.template.feature/pom.xml index c1960967c1..89d7f1feb7 100644 --- a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.chart.template.feature/pom.xml +++ b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.chart.template.feature/pom.xml @@ -89,7 +89,8 @@ org.wso2.maven carbon-p2-plugin - 1.5.3 + ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.realtime.provider.template.feature/pom.xml b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.realtime.provider.template.feature/pom.xml index ca1cc41ec1..5b7cd66787 100644 --- a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.realtime.provider.template.feature/pom.xml +++ b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.realtime.provider.template.feature/pom.xml @@ -94,7 +94,8 @@ org.wso2.maven carbon-p2-plugin - 1.5.3 + ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.rest.provider.template.feature/pom.xml b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.rest.provider.template.feature/pom.xml index c0d4546ac4..2c919dc920 100644 --- a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.rest.provider.template.feature/pom.xml +++ b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.rest.provider.template.feature/pom.xml @@ -94,7 +94,8 @@ org.wso2.maven carbon-p2-plugin - 1.5.3 + ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.template.feature/pom.xml b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.template.feature/pom.xml index 36b6971add..872387a53f 100644 --- a/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.template.feature/pom.xml +++ b/features/analytics-gadget-templates/org.wso2.carbon.analytics.gadget.template.feature/pom.xml @@ -59,6 +59,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/application-deployer/org.wso2.carbon.event.application.deployer.feature/pom.xml b/features/application-deployer/org.wso2.carbon.event.application.deployer.feature/pom.xml index 6781e9fb2c..6f785210d7 100644 --- a/features/application-deployer/org.wso2.carbon.event.application.deployer.feature/pom.xml +++ b/features/application-deployer/org.wso2.carbon.event.application.deployer.feature/pom.xml @@ -46,6 +46,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/dashboard-template-deployer/org.wso2.carbon.dashboard.template.deployer.server.feature/pom.xml b/features/dashboard-template-deployer/org.wso2.carbon.dashboard.template.deployer.server.feature/pom.xml index 3496875b4b..3142531d72 100644 --- a/features/dashboard-template-deployer/org.wso2.carbon.dashboard.template.deployer.server.feature/pom.xml +++ b/features/dashboard-template-deployer/org.wso2.carbon.dashboard.template.deployer.server.feature/pom.xml @@ -48,6 +48,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.agent.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.agent.server.feature/pom.xml index b7770e88c9..7f27711bbd 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.agent.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.agent.server.feature/pom.xml @@ -61,6 +61,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.commons.binary.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.commons.binary.server.feature/pom.xml index 5278f7c7b9..104c3bee6e 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.commons.binary.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.commons.binary.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.commons.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.commons.server.feature/pom.xml index 1ea3193623..456475fdde 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.commons.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.commons.server.feature/pom.xml @@ -49,7 +49,8 @@ org.wso2.maven carbon-p2-plugin - ${carbon.p2.plugin.version} + ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.commons.thrift.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.commons.thrift.server.feature/pom.xml index de6dabf8fc..43ee475c8d 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.commons.thrift.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.commons.thrift.server.feature/pom.xml @@ -52,6 +52,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.core.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.core.server.feature/pom.xml index cd3aec58ee..f097c09302 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.core.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.core.server.feature/pom.xml @@ -58,6 +58,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.datapublisher.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.datapublisher.feature/pom.xml index c5e7736a31..6754f38596 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.datapublisher.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.datapublisher.feature/pom.xml @@ -55,6 +55,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.datareceiver.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.datareceiver.feature/pom.xml index 62acf0b4c4..1efd0c6545 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.datareceiver.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.datareceiver.feature/pom.xml @@ -70,6 +70,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.receiver.binary.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.receiver.binary.server.feature/pom.xml index 2cb0ca41b8..8a91dffb07 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.receiver.binary.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.receiver.binary.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation @@ -84,4 +85,3 @@ - diff --git a/features/data-bridge/org.wso2.carbon.databridge.receiver.thrift.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.receiver.thrift.server.feature/pom.xml index ca79e118cc..d23c610763 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.receiver.thrift.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.receiver.thrift.server.feature/pom.xml @@ -46,7 +46,8 @@ org.wso2.maven carbon-p2-plugin - ${carbon.p2.plugin.version} + ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem.server.feature/pom.xml index 7dd4a1ef6b..91a27a99ee 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/data-bridge/org.wso2.carbon.databridge.streamdefn.registry.server.feature/pom.xml b/features/data-bridge/org.wso2.carbon.databridge.streamdefn.registry.server.feature/pom.xml index d92253d9b6..99162f5575 100644 --- a/features/data-bridge/org.wso2.carbon.databridge.streamdefn.registry.server.feature/pom.xml +++ b/features/data-bridge/org.wso2.carbon.databridge.streamdefn.registry.server.feature/pom.xml @@ -44,7 +44,8 @@ org.wso2.maven carbon-p2-plugin - ${carbon.p2.plugin.version} + ${carbon.p2.plugin.version} + true p2-feature-generation diff --git a/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.feature/pom.xml b/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.feature/pom.xml index fc52caf4ad..46b921b2ce 100644 --- a/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.feature/pom.xml +++ b/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.feature/pom.xml @@ -52,6 +52,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.server.feature/pom.xml b/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.server.feature/pom.xml index 0d98b37f03..a81e2a704b 100644 --- a/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.server.feature/pom.xml +++ b/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.ui.feature/pom.xml b/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.ui.feature/pom.xml index 74b1db5cc1..18fc7025d3 100644 --- a/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.ui.feature/pom.xml +++ b/features/event-monitor/event-statistics/org.wso2.carbon.event.statistics.ui.feature/pom.xml @@ -53,6 +53,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.feature/pom.xml b/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.feature/pom.xml index 76a65cf539..f20b07128b 100644 --- a/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.feature/pom.xml +++ b/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.feature/pom.xml @@ -52,6 +52,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.server.feature/pom.xml b/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.server.feature/pom.xml index 54bc4d7f22..8c16667243 100644 --- a/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.server.feature/pom.xml +++ b/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.server.feature/pom.xml @@ -46,6 +46,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.ui.feature/pom.xml b/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.ui.feature/pom.xml index a0fc4267b1..0c754050bd 100644 --- a/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.ui.feature/pom.xml +++ b/features/event-monitor/event-tracer/org.wso2.carbon.event.tracer.ui.feature/pom.xml @@ -51,6 +51,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-processor-manager/org.wso2.carbon.event.processor.manager.commons.feature/pom.xml b/features/event-processor-manager/org.wso2.carbon.event.processor.manager.commons.feature/pom.xml index e0e15e9c06..c006e655da 100644 --- a/features/event-processor-manager/org.wso2.carbon.event.processor.manager.commons.feature/pom.xml +++ b/features/event-processor-manager/org.wso2.carbon.event.processor.manager.commons.feature/pom.xml @@ -50,6 +50,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-processor-manager/org.wso2.carbon.event.processor.manager.core.feature/pom.xml b/features/event-processor-manager/org.wso2.carbon.event.processor.manager.core.feature/pom.xml index 40add550da..c4c653eed8 100644 --- a/features/event-processor-manager/org.wso2.carbon.event.processor.manager.core.feature/pom.xml +++ b/features/event-processor-manager/org.wso2.carbon.event.processor.manager.core.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.cassandra.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.cassandra.server.feature/pom.xml index 68d1a0ccf6..aa25219a96 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.cassandra.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.cassandra.server.feature/pom.xml @@ -46,6 +46,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.email.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.email.server.feature/pom.xml index 3d675d46a9..f4dc5ad27f 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.email.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.email.server.feature/pom.xml @@ -45,6 +45,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.feature/pom.xml index 83373f0876..a5fedb48aa 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.feature/pom.xml @@ -150,6 +150,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.http.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.http.server.feature/pom.xml index 7b1cade15d..f09214d184 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.http.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.http.server.feature/pom.xml @@ -39,6 +39,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.jms.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.jms.server.feature/pom.xml index 96821c46e0..50bc8562c3 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.jms.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.jms.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.kafka.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.kafka.server.feature/pom.xml index 21ddde2bdf..5e9a8ce8c1 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.kafka.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.kafka.server.feature/pom.xml @@ -38,6 +38,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.logger.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.logger.server.feature/pom.xml index b8c553bd8b..24fe0902ce 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.logger.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.logger.server.feature/pom.xml @@ -38,6 +38,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.mqtt.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.mqtt.server.feature/pom.xml index 3640bde612..a487496047 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.mqtt.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.mqtt.server.feature/pom.xml @@ -41,6 +41,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.rdbms.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.rdbms.server.feature/pom.xml index e2183a6b15..6f05ba6c96 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.rdbms.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.rdbms.server.feature/pom.xml @@ -38,6 +38,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.server.feature/pom.xml index ff785ec9c8..99e3b50526 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.server.feature/pom.xml @@ -55,6 +55,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.sms.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.sms.server.feature/pom.xml index 3b6007baf4..e74efdc831 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.sms.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.sms.server.feature/pom.xml @@ -46,6 +46,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.soap.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.soap.server.feature/pom.xml index 03918b6bdb..cc321f4f7f 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.soap.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.soap.server.feature/pom.xml @@ -38,6 +38,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.ui.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.ui.server.feature/pom.xml index b72124a7af..8c25757c24 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.ui.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.ui.server.feature/pom.xml @@ -45,6 +45,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.local.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.local.server.feature/pom.xml index f6b0f25266..d22d1ff54a 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.local.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.local.server.feature/pom.xml @@ -72,6 +72,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.server.feature/pom.xml index ee8e0d0e6b..82f79a4970 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.websocket.server.feature/pom.xml @@ -50,6 +50,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.output.adapter.wso2event.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.output.adapter.wso2event.server.feature/pom.xml index f1c0aa9f27..49fa36a293 100644 --- a/features/event-publisher/org.wso2.carbon.event.output.adapter.wso2event.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.output.adapter.wso2event.server.feature/pom.xml @@ -46,6 +46,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.publisher.aggregate.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.publisher.aggregate.feature/pom.xml index 5acc12bbed..7f3bb5fc8d 100644 --- a/features/event-publisher/org.wso2.carbon.event.publisher.aggregate.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.publisher.aggregate.feature/pom.xml @@ -79,6 +79,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.publisher.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.publisher.feature/pom.xml index cc048f1324..f3f1a32bdd 100644 --- a/features/event-publisher/org.wso2.carbon.event.publisher.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.publisher.feature/pom.xml @@ -61,6 +61,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.publisher.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.publisher.server.feature/pom.xml index b1f7d18468..26f3c5c02b 100644 --- a/features/event-publisher/org.wso2.carbon.event.publisher.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.publisher.server.feature/pom.xml @@ -62,6 +62,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.publisher.template.deployer.server.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.publisher.template.deployer.server.feature/pom.xml index e0e144507b..af3159890e 100644 --- a/features/event-publisher/org.wso2.carbon.event.publisher.template.deployer.server.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.publisher.template.deployer.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-publisher/org.wso2.carbon.event.publisher.ui.feature/pom.xml b/features/event-publisher/org.wso2.carbon.event.publisher.ui.feature/pom.xml index 791b524463..7fa22916e1 100644 --- a/features/event-publisher/org.wso2.carbon.event.publisher.ui.feature/pom.xml +++ b/features/event-publisher/org.wso2.carbon.event.publisher.ui.feature/pom.xml @@ -49,6 +49,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.email.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.email.server.feature/pom.xml index 22f65255f8..ce45b6657b 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.email.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.email.server.feature/pom.xml @@ -46,6 +46,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.feature/pom.xml index 998febfd0c..058e79d6d8 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.feature/pom.xml @@ -112,6 +112,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.filetail.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.filetail.server.feature/pom.xml index c53287ca79..6e3ef1a6f3 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.filetail.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.filetail.server.feature/pom.xml @@ -40,6 +40,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.http.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.http.server.feature/pom.xml index 4a6f0afbb8..052507ea05 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.http.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.http.server.feature/pom.xml @@ -40,6 +40,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.jms.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.jms.server.feature/pom.xml index bfa3925e58..a318c1177f 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.jms.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.jms.server.feature/pom.xml @@ -48,6 +48,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.kafka.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.kafka.server.feature/pom.xml index 833d67c384..8df70dcb0a 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.kafka.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.kafka.server.feature/pom.xml @@ -39,6 +39,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.mqtt.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.mqtt.server.feature/pom.xml index cfed53393a..898902ef5b 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.mqtt.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.mqtt.server.feature/pom.xml @@ -41,6 +41,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.server.feature/pom.xml index 848eba772a..c6040d6b00 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.server.feature/pom.xml @@ -55,6 +55,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.soap.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.soap.server.feature/pom.xml index d06022fe3d..c3eda51421 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.soap.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.soap.server.feature/pom.xml @@ -39,6 +39,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.local.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.local.server.feature/pom.xml index 6b02413dc0..b7a749ceea 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.local.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.local.server.feature/pom.xml @@ -74,6 +74,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.server.feature/pom.xml index bbf754778d..adc077cfac 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.websocket.server.feature/pom.xml @@ -50,6 +50,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.input.adapter.wso2event.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.input.adapter.wso2event.server.feature/pom.xml index 3fea38c0e5..bb5636fd1b 100644 --- a/features/event-receiver/org.wso2.carbon.event.input.adapter.wso2event.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.input.adapter.wso2event.server.feature/pom.xml @@ -48,6 +48,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.receiver.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.receiver.feature/pom.xml index 51ace8b436..610ac4f1c1 100644 --- a/features/event-receiver/org.wso2.carbon.event.receiver.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.receiver.feature/pom.xml @@ -60,6 +60,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.receiver.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.receiver.server.feature/pom.xml index 350ee30062..c1993c2bba 100644 --- a/features/event-receiver/org.wso2.carbon.event.receiver.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.receiver.server.feature/pom.xml @@ -74,6 +74,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.receiver.template.deployer.server.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.receiver.template.deployer.server.feature/pom.xml index 859ad50fe6..924c34fda5 100644 --- a/features/event-receiver/org.wso2.carbon.event.receiver.template.deployer.server.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.receiver.template.deployer.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-receiver/org.wso2.carbon.event.receiver.ui.feature/pom.xml b/features/event-receiver/org.wso2.carbon.event.receiver.ui.feature/pom.xml index 21f2c9eaa0..c5be9d1be0 100644 --- a/features/event-receiver/org.wso2.carbon.event.receiver.ui.feature/pom.xml +++ b/features/event-receiver/org.wso2.carbon.event.receiver.ui.feature/pom.xml @@ -49,6 +49,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-stream/org.wso2.carbon.event.stream.feature/pom.xml b/features/event-stream/org.wso2.carbon.event.stream.feature/pom.xml index 34421305e1..e9b488780b 100644 --- a/features/event-stream/org.wso2.carbon.event.stream.feature/pom.xml +++ b/features/event-stream/org.wso2.carbon.event.stream.feature/pom.xml @@ -53,6 +53,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-stream/org.wso2.carbon.event.stream.server.feature/pom.xml b/features/event-stream/org.wso2.carbon.event.stream.server.feature/pom.xml index 863bd0deec..47875e0133 100644 --- a/features/event-stream/org.wso2.carbon.event.stream.server.feature/pom.xml +++ b/features/event-stream/org.wso2.carbon.event.stream.server.feature/pom.xml @@ -51,6 +51,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-stream/org.wso2.carbon.event.stream.template.deployer.server.feature/pom.xml b/features/event-stream/org.wso2.carbon.event.stream.template.deployer.server.feature/pom.xml index e9e555c3cb..ed8af967bc 100644 --- a/features/event-stream/org.wso2.carbon.event.stream.template.deployer.server.feature/pom.xml +++ b/features/event-stream/org.wso2.carbon.event.stream.template.deployer.server.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/event-stream/org.wso2.carbon.event.stream.ui.feature/pom.xml b/features/event-stream/org.wso2.carbon.event.stream.ui.feature/pom.xml index 5cdf9dbbc4..428435a552 100644 --- a/features/event-stream/org.wso2.carbon.event.stream.ui.feature/pom.xml +++ b/features/event-stream/org.wso2.carbon.event.stream.ui.feature/pom.xml @@ -54,6 +54,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/gadget-template-deployer/org.wso2.carbon.gadget.template.deployer.server.feature/pom.xml b/features/gadget-template-deployer/org.wso2.carbon.gadget.template.deployer.server.feature/pom.xml index 706bb9aad4..f0cbd617aa 100644 --- a/features/gadget-template-deployer/org.wso2.carbon.gadget.template.deployer.server.feature/pom.xml +++ b/features/gadget-template-deployer/org.wso2.carbon.gadget.template.deployer.server.feature/pom.xml @@ -48,6 +48,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer.server.feature/pom.xml b/features/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer.server.feature/pom.xml index 952102f335..3098c8a2d3 100644 --- a/features/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer.server.feature/pom.xml +++ b/features/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer.server.feature/pom.xml @@ -48,6 +48,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/spark-common/org.wso2.carbon.spark.commons.feature/pom.xml b/features/spark-common/org.wso2.carbon.spark.commons.feature/pom.xml index bebe5087ae..ab01a5a0d3 100644 --- a/features/spark-common/org.wso2.carbon.spark.commons.feature/pom.xml +++ b/features/spark-common/org.wso2.carbon.spark.commons.feature/pom.xml @@ -254,6 +254,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/template-manager/org.wso2.carbon.event.template.manager.feature/pom.xml b/features/template-manager/org.wso2.carbon.event.template.manager.feature/pom.xml index a013b6ba80..5b7bd8d174 100644 --- a/features/template-manager/org.wso2.carbon.event.template.manager.feature/pom.xml +++ b/features/template-manager/org.wso2.carbon.event.template.manager.feature/pom.xml @@ -46,6 +46,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/template-manager/org.wso2.carbon.event.template.manager.server.feature/pom.xml b/features/template-manager/org.wso2.carbon.event.template.manager.server.feature/pom.xml index 97e94b3eb5..73e3ee44ec 100644 --- a/features/template-manager/org.wso2.carbon.event.template.manager.server.feature/pom.xml +++ b/features/template-manager/org.wso2.carbon.event.template.manager.server.feature/pom.xml @@ -69,6 +69,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/features/template-manager/org.wso2.carbon.event.template.manager.ui.feature/pom.xml b/features/template-manager/org.wso2.carbon.event.template.manager.ui.feature/pom.xml index 75905cb6ff..b4131cb07a 100644 --- a/features/template-manager/org.wso2.carbon.event.template.manager.ui.feature/pom.xml +++ b/features/template-manager/org.wso2.carbon.event.template.manager.ui.feature/pom.xml @@ -47,6 +47,7 @@ org.wso2.maven carbon-p2-plugin ${carbon.p2.plugin.version} + true 4-p2-feature-generation diff --git a/pom.xml b/pom.xml index 57ad048133..197aff3f9a 100644 --- a/pom.xml +++ b/pom.xml @@ -302,12 +302,12 @@ ${httpcore.httpcomponents.wso2.version} - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi ${org.eclipse.osgi.version} - org.eclipse.osgi + org.eclipse.platform org.eclipse.osgi.services ${version.equinox.osgi.services} @@ -1248,7 +1248,11 @@ org.wso2.carbon.pax-logging-log4j2-plugins ${carbon.kernel.version} - + + javax.xml.bind + jaxb-api + ${version.jaxb.api} + @@ -1323,7 +1327,7 @@ org.apache.felix maven-bundle-plugin - 3.2.0 + 5.1.9 true NONE @@ -1523,7 +1527,7 @@ 1.1.5 - 4.7.19 + 4.9.20-SNAPSHOT @@ -1531,7 +1535,7 @@ 3.2.15 3.0.0.wso2v7 - 1.5.4 + 5.4.15-SNAPSHOT 7.0.54 1.2.11-wso2v16 [1.2.11-wso2v16, 1.3.0) @@ -1565,8 +1569,8 @@ 6.11 2.2 4.5 - 3.7.0.v20110613 - 3.3.100.v20120522-1822 + 3.19.0 + 3.12.0 1.5.10.wso2v1 33.0.0-jre 1.5.6.wso2v1 @@ -1659,6 +1663,8 @@ 1.26.0 1.11.10 [1.2.0,2.0.0) + + 2.4.0-b180830.0359