You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2018/02/27 15:55:19 UTC
[01/11] incubator-unomi git commit: UNOMI-153 add event when updating
camel route (remove,
add or update) to make sure route are synchronize in the cluster [Forced
Update!]
Repository: incubator-unomi
Updated Branches:
refs/heads/feature-UNOMI-5-KARAF4-1 637898cfd -> 966cf9295 (forced update)
UNOMI-153 add event when updating camel route (remove, add or update) to make sure route are synchronize in the cluster
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/bd34ae9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/bd34ae9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/bd34ae9e
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: bd34ae9e0d3e6101a9aeb5a0988b3c0c099bbf97
Parents: f84401a
Author: dgaillard <dg...@jahia.com>
Authored: Mon Feb 26 17:48:46 2018 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Mon Feb 26 17:48:46 2018 +0100
----------------------------------------------------------------------
.../unomi/api/services/ClusterService.java | 8 +++
.../unomi/router/api/IRouterCamelContext.java | 4 +-
extensions/router/router-core/pom.xml | 10 +++
.../router/core/context/RouterCamelContext.java | 42 ++++++++---
.../core/event/UpdateCamelRouteEvent.java | 47 +++++++++++++
.../event/UpdateCamelRouteEventHandler.java | 74 ++++++++++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 17 +++++
.../ExportConfigurationServiceImpl.java | 4 +-
.../ImportConfigurationServiceImpl.java | 4 +-
.../services/services/ClusterServiceImpl.java | 9 +++
10 files changed, 204 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/api/src/main/java/org/apache/unomi/api/services/ClusterService.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/services/ClusterService.java b/api/src/main/java/org/apache/unomi/api/services/ClusterService.java
index b851b78..9a0fdfa 100644
--- a/api/src/main/java/org/apache/unomi/api/services/ClusterService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/ClusterService.java
@@ -19,6 +19,7 @@ package org.apache.unomi.api.services;
import org.apache.unomi.api.ClusterNode;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -49,4 +50,11 @@ public interface ClusterService {
*/
void purge(final String scope);
+ /**
+ * This function will send an event to the nodes of the cluster
+ * The function takes a Serializable to avoid dependency on any clustering framework
+ *
+ * @param event this object will be cast to {@link org.apache.karaf.cellar.core.event.Event}
+ */
+ void sendEvent(Serializable event);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/IRouterCamelContext.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/IRouterCamelContext.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/IRouterCamelContext.java
index d2d3249..8775b43 100644
--- a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/IRouterCamelContext.java
+++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/IRouterCamelContext.java
@@ -21,7 +21,7 @@ package org.apache.unomi.router.api;
*/
public interface IRouterCamelContext {
- void killExistingRoute(String routeId) throws Exception;
+ void killExistingRoute(String routeId, boolean fireEvent) throws Exception;
- void updateProfileReaderRoute(Object configuration) throws Exception;
+ void updateProfileReaderRoute(Object configuration, boolean fireEvent) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml
index 42e10dc..d393e3b 100644
--- a/extensions/router/router-core/pom.xml
+++ b/extensions/router/router-core/pom.xml
@@ -137,6 +137,16 @@
<version>0.10.1.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>org.apache.karaf.cellar.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>org.apache.karaf.cellar.config</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
index 3b18803..03b2e04 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
@@ -21,6 +21,7 @@ import org.apache.camel.Route;
import org.apache.camel.component.jackson.JacksonDataFormat;
import org.apache.camel.core.osgi.OsgiDefaultCamelContext;
import org.apache.camel.model.RouteDefinition;
+import org.apache.unomi.api.services.ClusterService;
import org.apache.unomi.api.services.ConfigSharingService;
import org.apache.unomi.api.services.ProfileService;
import org.apache.unomi.persistence.spi.PersistenceService;
@@ -30,6 +31,7 @@ import org.apache.unomi.router.api.ImportConfiguration;
import org.apache.unomi.router.api.RouterConstants;
import org.apache.unomi.router.api.services.ImportExportConfigurationService;
import org.apache.unomi.router.api.services.ProfileExportService;
+import org.apache.unomi.router.core.event.UpdateCamelRouteEvent;
import org.apache.unomi.router.core.processor.ExportRouteCompletionProcessor;
import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor;
import org.apache.unomi.router.core.processor.ImportRouteCompletionProcessor;
@@ -70,6 +72,7 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
private String allowedEndpoints;
private BundleContext bundleContext;
private ConfigSharingService configSharingService;
+ private ClusterService clusterService;
public void setExecHistorySize(String execHistorySize) {
this.execHistorySize = execHistorySize;
@@ -87,6 +90,10 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
this.configSharingService = configSharingService;
}
+ public void setClusterService(ClusterService clusterService) {
+ this.clusterService = clusterService;
+ }
+
public void initCamelContext() throws Exception {
logger.info("Initialize Camel Context...");
@@ -160,10 +167,9 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
exportConfigurationService.setRouterCamelContext(this);
logger.info("Camel Context {} initialized successfully.");
-
}
- public void killExistingRoute(String routeId) throws Exception {
+ public void killExistingRoute(String routeId, boolean fireEvent) throws Exception {
//Active routes
Route route = camelContext.getRoute(routeId);
if (route != null) {
@@ -172,18 +178,24 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
camelContext.removeRouteDefinition(routeDefinition);
}
}
+
+ if (fireEvent) {
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.remove");
+ event.setRouteId(routeId);
+ clusterService.sendEvent(event);
+ }
}
- public void updateProfileReaderRoute(Object configuration) throws Exception {
+ public void updateProfileReaderRoute(Object configuration, boolean fireEvent) throws Exception {
if (configuration instanceof ImportConfiguration) {
- updateProfileImportReaderRoute((ImportConfiguration) configuration);
+ updateProfileImportReaderRoute((ImportConfiguration) configuration, fireEvent);
} else {
- updateProfileExportReaderRoute((ExportConfiguration) configuration);
+ updateProfileExportReaderRoute((ExportConfiguration) configuration, fireEvent);
}
}
- private void updateProfileImportReaderRoute(ImportConfiguration importConfiguration) throws Exception {
- killExistingRoute(importConfiguration.getItemId());
+ private void updateProfileImportReaderRoute(ImportConfiguration importConfiguration, boolean fireEvent) throws Exception {
+ killExistingRoute(importConfiguration.getItemId(), false);
//Handle transforming an import config oneshot <--> recurrent
if (RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT.equals(importConfiguration.getConfigType())) {
ProfileImportFromSourceRouteBuilder builder = new ProfileImportFromSourceRouteBuilder(kafkaProps, configType);
@@ -194,11 +206,17 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
builder.setJacksonDataFormat(jacksonDataFormat);
builder.setContext(camelContext);
camelContext.addRoutes(builder);
+
+ if (fireEvent) {
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.import");
+ event.setConfiguration(importConfiguration);
+ clusterService.sendEvent(event);
+ }
}
}
- private void updateProfileExportReaderRoute(ExportConfiguration exportConfiguration) throws Exception {
- killExistingRoute(exportConfiguration.getItemId());
+ private void updateProfileExportReaderRoute(ExportConfiguration exportConfiguration, boolean fireEvent) throws Exception {
+ killExistingRoute(exportConfiguration.getItemId(), false);
//Handle transforming an import config oneshot <--> recurrent
if (RouterConstants.IMPORT_EXPORT_CONFIG_TYPE_RECURRENT.equals(exportConfiguration.getConfigType())) {
ProfileExportCollectRouteBuilder profileExportCollectRouteBuilder = new ProfileExportCollectRouteBuilder(kafkaProps, configType);
@@ -209,6 +227,12 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
profileExportCollectRouteBuilder.setJacksonDataFormat(jacksonDataFormat);
profileExportCollectRouteBuilder.setContext(camelContext);
camelContext.addRoutes(profileExportCollectRouteBuilder);
+
+ if (fireEvent) {
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.export");
+ event.setConfiguration(exportConfiguration);
+ clusterService.sendEvent(event);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEvent.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEvent.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEvent.java
new file mode 100644
index 0000000..7e1dc81
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEvent.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.unomi.router.core.event;
+
+import org.apache.karaf.cellar.core.event.Event;
+
+/**
+ * @author dgaillard
+ */
+public class UpdateCamelRouteEvent extends Event {
+ private String routeId;
+ private Object configuration;
+
+ public UpdateCamelRouteEvent(String id) {
+ super(id);
+ }
+
+ public String getRouteId() {
+ return routeId;
+ }
+
+ public void setRouteId(String routeId) {
+ this.routeId = routeId;
+ }
+
+ public Object getConfiguration() {
+ return configuration;
+ }
+
+ public void setConfiguration(Object configuration) {
+ this.configuration = configuration;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
new file mode 100644
index 0000000..6760f4c
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.unomi.router.core.event;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.karaf.cellar.config.Constants;
+import org.apache.karaf.cellar.core.CellarSupport;
+import org.apache.karaf.cellar.core.control.Switch;
+import org.apache.karaf.cellar.core.event.EventHandler;
+import org.apache.karaf.cellar.core.event.EventType;
+import org.apache.unomi.router.core.context.RouterCamelContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author dgaillard
+ */
+public class UpdateCamelRouteEventHandler extends CellarSupport implements EventHandler<UpdateCamelRouteEvent> {
+ private static final Logger logger = LoggerFactory.getLogger(UpdateCamelRouteEventHandler.class.getName());
+
+ private RouterCamelContext routerCamelContext;
+
+ @Override
+ public void handle(UpdateCamelRouteEvent event) {
+ logger.debug("Handle event");
+ if (isAllowed(event.getSourceGroup(), Constants.CATEGORY, event.getId(), EventType.INBOUND)) {
+ logger.debug("Event is allowed");
+ // check if it's not a "local" event
+ if (event.getSourceNode() != null && event.getSourceNode().getId().equalsIgnoreCase(clusterManager.getNode().getId())) {
+ logger.debug("Cluster event is local (coming from local synchronizer or listener)");
+ return;
+ }
+
+ try {
+ logger.debug("Event id is {}", event.getId());
+ if (event.getId().equals("org.apache.unomi.router.event.remove") && StringUtils.isNotBlank(event.getRouteId())) {
+ routerCamelContext.killExistingRoute(event.getRouteId(), false);
+ } else if ((event.getId().equals("org.apache.unomi.router.event.import") || event.getId().equals("org.apache.unomi.router.event.export")) && event.getConfiguration() != null) {
+ routerCamelContext.updateProfileReaderRoute(event.getConfiguration(), false);
+ }
+ } catch (Exception e) {
+ logger.error("Error when executing event", e);
+ }
+ }
+ }
+
+ @Override
+ public Class<UpdateCamelRouteEvent> getType() {
+ return UpdateCamelRouteEvent.class;
+ }
+
+ @Override
+ public Switch getSwitch() {
+ return null;
+ }
+
+ public void setRouterCamelContext(RouterCamelContext routerCamelContext) {
+ this.routerCamelContext = routerCamelContext;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 3f81b5a..d61d64f 100644
--- a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -112,12 +112,25 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="profileExportService" ref="profileExportService"/>
<property name="profileService" ref="profileService"/>
+ <property name="clusterService" ref="clusterService" />
</bean>
<bean id="collectProfileBean" class="org.apache.unomi.router.core.bean.CollectProfileBean">
<property name="persistenceService" ref="persistenceService"/>
</bean>
+ <bean id="updateCamelRouteEventHandler" class="org.apache.unomi.router.core.event.UpdateCamelRouteEventHandler">
+ <property name="configurationAdmin" ref="osgiConfigurationAdmin"/>
+ <property name="clusterManager" ref="karafCellarClusterManager"/>
+ <property name="groupManager" ref="karafCellarGroupManager"/>
+ <property name="routerCamelContext" ref="camelContext"/>
+ </bean>
+ <service ref="updateCamelRouteEventHandler" interface="org.apache.karaf.cellar.core.event.EventHandler">
+ <service-properties>
+ <entry key="managed" value="true"/>
+ </service-properties>
+ </service>
+
<reference id="configSharingService" interface="org.apache.unomi.api.services.ConfigSharingService" />
<reference id="profileImportService" interface="org.apache.unomi.router.api.services.ProfileImportService"/>
<reference id="profileExportService" interface="org.apache.unomi.router.api.services.ProfileExportService"/>
@@ -126,5 +139,9 @@
<reference id="segmentService" interface="org.apache.unomi.api.services.SegmentService"/>
<reference id="importConfigurationService" interface="org.apache.unomi.router.api.services.ImportExportConfigurationService" filter="(configDiscriminator=IMPORT)"/>
<reference id="exportConfigurationService" interface="org.apache.unomi.router.api.services.ImportExportConfigurationService" filter="(configDiscriminator=EXPORT)"/>
+ <reference id="clusterService" interface="org.apache.unomi.api.services.ClusterService" />
+ <reference id="karafCellarGroupManager" interface="org.apache.karaf.cellar.core.GroupManager" />
+ <reference id="osgiConfigurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
+ <reference id="karafCellarClusterManager" interface="org.apache.karaf.cellar.core.ClusterManager" />
</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ExportConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ExportConfigurationServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ExportConfigurationServiceImpl.java
index 101c2f3..2378717 100644
--- a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ExportConfigurationServiceImpl.java
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ExportConfigurationServiceImpl.java
@@ -53,7 +53,7 @@ public class ExportConfigurationServiceImpl extends AbstractConfigurationService
}
if(updateRunningRoute) {
try {
- routerCamelContext.updateProfileReaderRoute(exportConfiguration);
+ routerCamelContext.updateProfileReaderRoute(exportConfiguration, true);
} catch (Exception e) {
logger.error("Error when trying to save/update running Apache Camel Route: {}", exportConfiguration.getItemId());
}
@@ -65,7 +65,7 @@ public class ExportConfigurationServiceImpl extends AbstractConfigurationService
@Override
public void delete(String configId) {
try {
- routerCamelContext.killExistingRoute(configId);
+ routerCamelContext.killExistingRoute(configId, true);
} catch (Exception e) {
logger.error("Error when trying to delete running Apache Camel Route: {}", configId);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
index 0813f05..364ea73 100644
--- a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
@@ -53,7 +53,7 @@ public class ImportConfigurationServiceImpl extends AbstractConfigurationService
}
if(updateRunningRoute) {
try {
- routerCamelContext.updateProfileReaderRoute(importConfiguration);
+ routerCamelContext.updateProfileReaderRoute(importConfiguration, true);
} catch (Exception e) {
logger.error("Error when trying to save/update running Apache Camel Route: {}", importConfiguration.getItemId());
}
@@ -65,7 +65,7 @@ public class ImportConfigurationServiceImpl extends AbstractConfigurationService
@Override
public void delete(String configId) {
try {
- routerCamelContext.killExistingRoute(configId);
+ routerCamelContext.killExistingRoute(configId, true);
} catch (Exception e) {
logger.error("Error when trying to delete running Apache Camel Route: {}", configId);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bd34ae9e/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
index 6bc0cdc..163812d 100644
--- a/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
@@ -22,6 +22,7 @@ import org.apache.karaf.cellar.config.ClusterConfigurationEvent;
import org.apache.karaf.cellar.config.Constants;
import org.apache.karaf.cellar.core.*;
import org.apache.karaf.cellar.core.control.SwitchStatus;
+import org.apache.karaf.cellar.core.event.Event;
import org.apache.karaf.cellar.core.event.EventProducer;
import org.apache.karaf.cellar.core.event.EventType;
import org.apache.unomi.api.ClusterNode;
@@ -224,6 +225,14 @@ public class ClusterServiceImpl implements ClusterService {
persistenceService.purge(scope);
}
+ @Override
+ public void sendEvent(Serializable eventObject) {
+ Event event = (Event) eventObject;
+ event.setSourceGroup(group);
+ event.setSourceNode(karafCellarClusterManager.getNode());
+ karafCellarEventProducer.produce(event);
+ }
+
/**
* Check if a configuration is allowed.
*
[07/11] incubator-unomi git commit: [jgitflow-maven-plugin]updating
poms for unomi_2.0.0 version
Posted by sh...@apache.org.
[jgitflow-maven-plugin]updating poms for unomi_2.0.0 version
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/e713faf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e713faf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e713faf5
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: e713faf54610ae8935601efa1baeab4ecea39f09
Parents: 7377414
Author: Serge Huber <sh...@jahia.com>
Authored: Thu Feb 22 11:26:21 2018 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Feb 27 16:42:03 2018 +0100
----------------------------------------------------------------------
api/pom.xml | 2 +-
common/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 ++---
extensions/geonames/services/pom.xml | 8 ++---
extensions/lists-extension/actions/pom.xml | 8 ++---
extensions/lists-extension/pom.xml | 4 +--
extensions/lists-extension/rest/pom.xml | 8 ++---
extensions/lists-extension/services/pom.xml | 8 ++---
extensions/pom.xml | 2 +-
extensions/privacy-extension/pom.xml | 4 +--
extensions/privacy-extension/rest/pom.xml | 8 ++---
extensions/privacy-extension/services/pom.xml | 8 ++---
extensions/router/pom.xml | 2 +-
extensions/router/router-api/pom.xml | 2 +-
extensions/router/router-core/pom.xml | 2 +-
extensions/router/router-karaf-feature/pom.xml | 2 +-
extensions/router/router-rest/pom.xml | 2 +-
extensions/router/router-service/pom.xml | 2 +-
extensions/salesforce-connector/actions/pom.xml | 6 ++--
.../salesforce-connector/karaf-kar/pom.xml | 10 +++---
extensions/salesforce-connector/pom.xml | 2 +-
extensions/salesforce-connector/rest/pom.xml | 8 ++---
.../salesforce-connector/services/pom.xml | 6 ++--
extensions/unomi-mailchimp/actions/pom.xml | 6 ++--
extensions/unomi-mailchimp/karaf-kar/pom.xml | 5 ++-
extensions/unomi-mailchimp/pom.xml | 5 ++-
extensions/unomi-mailchimp/rest/pom.xml | 5 ++-
extensions/unomi-mailchimp/services/pom.xml | 5 ++-
extensions/weather-update/core/pom.xml | 2 +-
extensions/weather-update/karaf-kar/pom.xml | 4 +--
extensions/weather-update/pom.xml | 2 +-
kar/pom.xml | 38 ++++++++++----------
lifecycle-watcher/pom.xml | 2 +-
metrics/pom.xml | 6 ++--
package/pom.xml | 6 ++--
persistence-elasticsearch/core/pom.xml | 8 ++---
persistence-elasticsearch/pom.xml | 2 +-
persistence-spi/pom.xml | 4 +--
plugins/baseplugin/pom.xml | 6 ++--
plugins/hover-event/pom.xml | 4 +--
plugins/mail/pom.xml | 4 +--
plugins/optimization-test/pom.xml | 2 +-
plugins/past-event/pom.xml | 6 ++--
plugins/pom.xml | 4 +--
plugins/request/pom.xml | 2 +-
plugins/tracked-event/pom.xml | 6 ++--
pom.xml | 2 +-
rest/pom.xml | 6 ++--
samples/login-integration/pom.xml | 4 +--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 8 ++---
tools/pom.xml | 2 +-
tools/shell-commands/pom.xml | 2 +-
tools/shell-dev-commands/pom.xml | 8 ++---
wab/pom.xml | 6 ++--
57 files changed, 144 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 3ad25fb..1b890b8 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index b665c83..95f31dc 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 6657279..e0daf69 100644
--- a/extensions/geonames/pom.xml
+++ b/extensions/geonames/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 89f7d7b..5b5b882 100644
--- a/extensions/geonames/rest/pom.xml
+++ b/extensions/geonames/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index 72ed9d7..11f1d68 100644
--- a/extensions/geonames/services/pom.xml
+++ b/extensions/geonames/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<artifactId>cxs-geonames-services</artifactId>
<name>Apache Unomi :: Extensions :: Geonames Database :: Service</name>
<description>Service implementation for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/lists-extension/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/actions/pom.xml b/extensions/lists-extension/actions/pom.xml
index 2be2fa0..0311e64 100644
--- a/extensions/lists-extension/actions/pom.xml
+++ b/extensions/lists-extension/actions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,21 +28,21 @@
<name>Apache Unomi :: Extensions :: Lists :: Actions</name>
<description>List extension rule actions for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index a33d2fa..e83f0db 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -28,12 +28,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxs-lists-extension</artifactId>
<name>Apache Unomi :: Extensions :: Lists</name>
<description>List extension for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 0a9cad3..545688d 100644
--- a/extensions/lists-extension/rest/pom.xml
+++ b/extensions/lists-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index c3d16eb..79eceec 100644
--- a/extensions/lists-extension/services/pom.xml
+++ b/extensions/lists-extension/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<name>Apache Unomi :: Extensions :: Lists :: Service</name>
<description>List extension service implementation for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index e834413..2a9d457 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index ef7919a..1a7317d 100644
--- a/extensions/privacy-extension/pom.xml
+++ b/extensions/privacy-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxs-privacy-extension</artifactId>
<name>Apache Unomi :: Extensions :: Privacy</name>
<description>Privacy management extension for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index 514f1be..3516b5e 100644
--- a/extensions/privacy-extension/rest/pom.xml
+++ b/extensions/privacy-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 630230b..ae0b25c 100644
--- a/extensions/privacy-extension/services/pom.xml
+++ b/extensions/privacy-extension/services/pom.xml
@@ -20,27 +20,27 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cxs-privacy-extension-services</artifactId>
<name>Apache Unomi :: Extensions :: Privacy :: Services</name>
<description>Privacy management extension service implementation for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/router/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/pom.xml b/extensions/router/pom.xml
index 6a98d4d..5a40e79 100644
--- a/extensions/router/pom.xml
+++ b/extensions/router/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-router</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/router/router-api/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/pom.xml b/extensions/router/router-api/pom.xml
index 6040947..245d786 100644
--- a/extensions/router/router-api/pom.xml
+++ b/extensions/router/router-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml
index d393e3b..7c8cad1 100644
--- a/extensions/router/router-core/pom.xml
+++ b/extensions/router/router-core/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/router/router-karaf-feature/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-karaf-feature/pom.xml b/extensions/router/router-karaf-feature/pom.xml
index f8a4279..4c7117d 100644
--- a/extensions/router/router-karaf-feature/pom.xml
+++ b/extensions/router/router-karaf-feature/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/router/router-rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-rest/pom.xml b/extensions/router/router-rest/pom.xml
index a6d07c5..505e343 100644
--- a/extensions/router/router-rest/pom.xml
+++ b/extensions/router/router-rest/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/router/router-service/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/pom.xml b/extensions/router/router-service/pom.xml
index ce5615d..ca0c794 100644
--- a/extensions/router/router-service/pom.xml
+++ b/extensions/router/router-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/salesforce-connector/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/actions/pom.xml b/extensions/salesforce-connector/actions/pom.xml
index 18a8aa5..90fca38 100644
--- a/extensions/salesforce-connector/actions/pom.xml
+++ b/extensions/salesforce-connector/actions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/salesforce-connector/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/karaf-kar/pom.xml b/extensions/salesforce-connector/karaf-kar/pom.xml
index 3e9168c..dd391f3 100644
--- a/extensions/salesforce-connector/karaf-kar/pom.xml
+++ b/extensions/salesforce-connector/karaf-kar/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -50,17 +50,17 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-rest</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-actions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/salesforce-connector/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/pom.xml b/extensions/salesforce-connector/pom.xml
index 67e1fee..68cda81 100644
--- a/extensions/salesforce-connector/pom.xml
+++ b/extensions/salesforce-connector/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-salesforce-connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/salesforce-connector/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/rest/pom.xml b/extensions/salesforce-connector/rest/pom.xml
index e05461b..616c3b0 100644
--- a/extensions/salesforce-connector/rest/pom.xml
+++ b/extensions/salesforce-connector/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/salesforce-connector/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/services/pom.xml b/extensions/salesforce-connector/services/pom.xml
index 172bd17..87d3395 100644
--- a/extensions/salesforce-connector/services/pom.xml
+++ b/extensions/salesforce-connector/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/unomi-mailchimp/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/actions/pom.xml b/extensions/unomi-mailchimp/actions/pom.xml
index d7e901f..7942c63 100644
--- a/extensions/unomi-mailchimp/actions/pom.xml
+++ b/extensions/unomi-mailchimp/actions/pom.xml
@@ -15,15 +15,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector-actions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/unomi-mailchimp/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/karaf-kar/pom.xml b/extensions/unomi-mailchimp/karaf-kar/pom.xml
index 8f6be3d..6379bf4 100644
--- a/extensions/unomi-mailchimp/karaf-kar/pom.xml
+++ b/extensions/unomi-mailchimp/karaf-kar/pom.xml
@@ -16,14 +16,13 @@
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector-karaf-kar</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/unomi-mailchimp/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/pom.xml b/extensions/unomi-mailchimp/pom.xml
index 0f33684..9f02525 100644
--- a/extensions/unomi-mailchimp/pom.xml
+++ b/extensions/unomi-mailchimp/pom.xml
@@ -16,13 +16,12 @@
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/unomi-mailchimp/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/rest/pom.xml b/extensions/unomi-mailchimp/rest/pom.xml
index 8086434..800fbf5 100644
--- a/extensions/unomi-mailchimp/rest/pom.xml
+++ b/extensions/unomi-mailchimp/rest/pom.xml
@@ -16,12 +16,11 @@
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/unomi-mailchimp/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/services/pom.xml b/extensions/unomi-mailchimp/services/pom.xml
index ef73336..20cc0fb 100644
--- a/extensions/unomi-mailchimp/services/pom.xml
+++ b/extensions/unomi-mailchimp/services/pom.xml
@@ -16,14 +16,13 @@
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector-services</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/weather-update/core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/core/pom.xml b/extensions/weather-update/core/pom.xml
index ede8e15..686b9d3 100755
--- a/extensions/weather-update/core/pom.xml
+++ b/extensions/weather-update/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-weather-update</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-weather-update-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/weather-update/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/karaf-kar/pom.xml b/extensions/weather-update/karaf-kar/pom.xml
index ab324b3..229c02c 100644
--- a/extensions/weather-update/karaf-kar/pom.xml
+++ b/extensions/weather-update/karaf-kar/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-weather-update</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/extensions/weather-update/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/pom.xml b/extensions/weather-update/pom.xml
index 5928c9d..e8fe87d 100644
--- a/extensions/weather-update/pom.xml
+++ b/extensions/weather-update/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-weather-update</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 5f2295f..8db7bdd 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -34,92 +34,92 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-common</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-metrics</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-actions</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>shell-dev-commands</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/lifecycle-watcher/pom.xml
----------------------------------------------------------------------
diff --git a/lifecycle-watcher/pom.xml b/lifecycle-watcher/pom.xml
index ec18f38..d2029f0 100644
--- a/lifecycle-watcher/pom.xml
+++ b/lifecycle-watcher/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index bf4a708..754a960 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-metrics</artifactId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-common</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index a1cae4b..3114040 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-karaf-feature</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 2ddb83a..f3e44f8 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -45,13 +45,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-metrics</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index c0ae7f6..21cdbac 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 5d52eea..4588634 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index b0d2611..a38a486 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index ee6e14d..b8f7b9b 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 2cfe8e8..4f1a54b 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index ef80ffe..07120b6 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 3c6414f..6c5311b 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5bf5e03..37b9dfd 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 0c9174b..1bc3402 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index b12279a..fd3e806 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 99ff1b9..b8177dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 50232bf..f35b222 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/samples/login-integration/pom.xml
----------------------------------------------------------------------
diff --git a/samples/login-integration/pom.xml b/samples/login-integration/pom.xml
index bc3427f..91b8b77 100644
--- a/samples/login-integration/pom.xml
+++ b/samples/login-integration/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>login-integration-sample</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 9ae9d9f..03b8284 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index 167f24d..ffe027f 100644
--- a/samples/tweet-button-plugin/pom.xml
+++ b/samples/tweet-button-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index a479b13..9707991 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-metrics</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index 494c64d..686f0a4 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/tools/shell-commands/pom.xml
----------------------------------------------------------------------
diff --git a/tools/shell-commands/pom.xml b/tools/shell-commands/pom.xml
index 57fd11b..3bcbb6e 100644
--- a/tools/shell-commands/pom.xml
+++ b/tools/shell-commands/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-tools</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>shell-commands</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/tools/shell-dev-commands/pom.xml
----------------------------------------------------------------------
diff --git a/tools/shell-dev-commands/pom.xml b/tools/shell-dev-commands/pom.xml
index 533758f..e719c11 100644
--- a/tools/shell-dev-commands/pom.xml
+++ b/tools/shell-dev-commands/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-tools</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>shell-dev-commands</artifactId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-common</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e713faf5/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index f3572d2..bf5f16b 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -47,13 +47,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[09/11] incubator-unomi git commit: UNOMI-5 Upgrade to Karaf 4
Posted by sh...@apache.org.
UNOMI-5 Upgrade to Karaf 4
Signed-off-by: Serge Huber <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/7ba62fad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/7ba62fad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/7ba62fad
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 7ba62fadadc43bef69cc80b6486d28043ac6ab7d
Parents: e713faf
Author: Serge Huber <sh...@apache.org>
Authored: Mon Jan 30 20:24:45 2017 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Feb 27 16:42:03 2018 +0100
----------------------------------------------------------------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
kar/src/main/feature/feature.xml | 2 +-
package/pom.xml | 43 +++++++++++++++-----
.../resources/OSGI-INF/blueprint/blueprint.xml | 16 ++++----
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 4 +-
pom.xml | 19 ++++++---
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
services/pom.xml | 5 ---
.../services/services/SegmentServiceImpl.java | 33 ---------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 26 ++++++------
.../resources/OSGI-INF/blueprint/blueprint.xml | 14 ++++++-
14 files changed, 86 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 95a7366..767cc09 100644
--- a/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -44,6 +44,6 @@
<property name="pathToGeonamesDatabase" value="${request.geonamesDatabase.location}"/>
<property name="forceDbImport" value="${request.geonamesDatabase.forceImport}"/>
</bean>
- <service id="geonamesService" ref="geonamesServiceImpl" auto-export="interfaces"/>
+ <service id="geonamesService" ref="geonamesServiceImpl" interface="org.apache.unomi.geonames.services.GeonamesService"/>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9b1f44b..9398d0e 100644
--- a/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -31,5 +31,5 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="definitionsService" ref="definitionsService"/>
</bean>
- <service id="userListService" ref="userListServiceImpl" auto-export="interfaces"/>
+ <service id="userListService" ref="userListServiceImpl" interface="org.apache.unomi.services.UserListService"/>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 8a5d2a2..1b56fe9 100644
--- a/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -37,5 +37,5 @@
<property name="profileService" ref="profileService" />
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="privacyService" ref="privacyServiceImpl" auto-export="interfaces"/>
+ <service id="privacyService" ref="privacyServiceImpl" interface="org.apache.unomi.api.services.PrivacyService"/>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index d48e0c5..f9e37e9 100644
--- a/kar/src/main/feature/feature.xml
+++ b/kar/src/main/feature/feature.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="unomi-kar">
+<features name="unomi-kar" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<feature description="unomi-kar" version="${project.version}" name="unomi-kar"
start-level="70">
<feature>war</feature>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 3114040..ae5afd7 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -36,6 +36,8 @@
<dependencies>
+ <!-- Standard Apache Karaf Features -->
+
<dependency>
<!-- scope is compile so all features (there is only one) are installed into startup.properties and the feature repo itself is not installed -->
<groupId>org.apache.karaf.features</groupId>
@@ -45,13 +47,19 @@
<dependency>
<!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration -->
<groupId>org.apache.karaf.features</groupId>
- <artifactId>standard</artifactId>
+ <artifactId>framework</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
<artifactId>spring</artifactId>
<classifier>features</classifier>
<type>xml</type>
@@ -65,7 +73,8 @@
<scope>runtime</scope>
</dependency>
- <!--
+ <!-- Aditionnal Apache Unomi features -->
+
<dependency>
<groupId>org.apache.cxf.karaf</groupId>
<artifactId>apache-cxf</artifactId>
@@ -73,7 +82,6 @@
<type>xml</type>
<scope>runtime</scope>
</dependency>
- -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
<artifactId>apache-karaf-cellar</artifactId>
@@ -309,16 +317,16 @@
<artifactId>karaf-maven-plugin</artifactId>
<executions>
<execution>
- <id>install-kar</id>
- <phase>compile</phase>
+ <id>process-resources</id>
+ <phase>process-resources</phase>
<goals>
- <goal>install-kars</goal>
+ <goal>assembly</goal>
</goals>
</execution>
<execution>
<id>package</id>
<goals>
- <goal>instance-create-archive</goal>
+ <goal>archive</goal>
</goals>
</execution>
</executions>
@@ -327,13 +335,26 @@
<feature>wrapper</feature>
</installedFeatures>
<bootFeatures>
- <feature>standard</feature>
- <feature>management</feature>
+ <feature>framework</feature>
+ <feature>wrap</feature>
+ <feature>aries-blueprint</feature>
+ <feature>shell</feature>
+ <feature>shell-compat</feature>
+ <feature>feature</feature>
+ <feature>jaas</feature>
<feature>ssh</feature>
+ <feature>management</feature>
+ <feature>bundle</feature>
<feature>config</feature>
- <feature>region</feature>
- <feature>package</feature>
+ <feature>deployer</feature>
+ <feature>diagnostic</feature>
+ <feature>feature</feature>
+ <feature>instance</feature>
<feature>kar</feature>
+ <feature>log</feature>
+ <feature>package</feature>
+ <feature>service</feature>
+ <feature>system</feature>
<feature>war</feature>
<feature>cxf</feature>
<feature>cellar</feature>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 37f7ab1..2838aaa 100644
--- a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -157,7 +157,7 @@
<!-- Action executors -->
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="allEventToProfileProperties"/>
</service-properties>
@@ -166,14 +166,14 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="eventToProfileProperty"/>
</service-properties>
<bean class="org.apache.unomi.plugins.baseplugin.actions.EventToProfilePropertyAction"/>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="setProperty"/>
</service-properties>
@@ -201,7 +201,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="evaluateProfileSegments"/>
</service-properties>
@@ -210,14 +210,14 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="evaluateProfileAge"/>
</service-properties>
<bean class="org.apache.unomi.plugins.baseplugin.actions.EvaluateProfileAgeAction"/>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="setEventOccurenceCount"/>
</service-properties>
@@ -227,7 +227,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="sendEvent"/>
</service-properties>
@@ -236,7 +236,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="mergeProfilesOnProperty"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index e8e1849..0d9fa50 100644
--- a/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -42,7 +42,7 @@
<property name="mailServerPassword" value="${mail.server.password}"/>
<property name="mailServerSSLOnConnect" value="${mail.server.sslOnConnect}"/>
</bean>
- <service id="sendMailAction" ref="sendMailActionImpl" auto-export="interfaces">
+ <service id="sendMailAction" ref="sendMailActionImpl" interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="sendMail"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 478657a..839ad18 100644
--- a/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -45,7 +45,7 @@
class="org.apache.unomi.plugins.request.actions.RequestHeaderToProfilePropertyAction">
</bean>
<service id="requestHeaderToProfilePropertyAction" ref="requestHeaderToProfilePropertyActionImpl"
- auto-export="interfaces">
+ interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="requestHeaderToProfileProperty"/>
</service-properties>
@@ -55,7 +55,7 @@
class="org.apache.unomi.plugins.request.actions.RequestParameterToProfilePropertyAction">
</bean>
<service id="RequestParameterToProfilePropertyAction" ref="requestParameterToProfilePropertyActionImpl"
- auto-export="interfaces">
+ interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="requestParameterToProfileProperty"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b8177dd..cf3a182 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,12 +64,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.0.2</cxf.version>
+ <cxf.version>3.1.0</cxf.version>
<version.jackson.core>2.6.6</version.jackson.core> <!-- version used by CXF -->
<version.jackson.jaxb>2.6.6</version.jackson.jaxb> <!-- version used by CXF -->
- <version.karaf>3.0.8</version.karaf>
- <version.karaf.cellar>3.0.3</version.karaf.cellar>
- <version.pax.exam>4.11.0</version.pax.exam>
+ <version.karaf>4.0.8</version.karaf>
+ <version.karaf.cellar>4.0.3</version.karaf.cellar>
+ <version.pax.exam>4.11.2</version.pax.exam>
<elasticsearch.version>5.6.3</elasticsearch.version>
<maven.compiler.source>1.7</maven.compiler.source>
@@ -624,14 +624,20 @@
<!-- Apache Karaf dependencies -->
<dependency>
- <!-- scope is compile so all features (there is only one) are installed into startup.properties and the feature repo itself is not installed -->
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${version.karaf}</version>
<type>kar</type>
</dependency>
<dependency>
- <!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration -->
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <classifier>features</classifier>
+ <version>${version.karaf}</version>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
<classifier>features</classifier>
@@ -878,6 +884,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.2.0</version>
+ <extensions>true</extensions>
<configuration>
<instructions>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 101c07c..0059ec7 100644
--- a/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -23,7 +23,7 @@
<reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
<!-- Action executor -->
- <service id="incrementTweetNumberAction" auto-export="interfaces">
+ <service id="incrementTweetNumberAction" interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="incrementTweetNumber"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 9707991..acd584d 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -80,11 +80,6 @@
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
index 169efd7..b0d7335 100644
--- a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
@@ -39,7 +39,6 @@ import org.osgi.framework.SynchronousBundleListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.json.*;
import java.io.IOException;
import java.net.URL;
import java.security.MessageDigest;
@@ -65,38 +64,6 @@ public class SegmentServiceImpl extends AbstractServiceImpl implements SegmentSe
logger.info("Initializing segment service...");
}
- public static void dumpJSON(JsonValue tree, String key, String depthPrefix) {
- if (key != null)
- logger.info(depthPrefix + "Key " + key + ": ");
- switch (tree.getValueType()) {
- case OBJECT:
- logger.info(depthPrefix + "OBJECT");
- JsonObject object = (JsonObject) tree;
- for (String name : object.keySet())
- dumpJSON(object.get(name), name, depthPrefix + " ");
- break;
- case ARRAY:
- logger.info(depthPrefix + "ARRAY");
- JsonArray array = (JsonArray) tree;
- for (JsonValue val : array)
- dumpJSON(val, null, depthPrefix + " ");
- break;
- case STRING:
- JsonString st = (JsonString) tree;
- logger.info(depthPrefix + "STRING " + st.getString());
- break;
- case NUMBER:
- JsonNumber num = (JsonNumber) tree;
- logger.info(depthPrefix + "NUMBER " + num.toString());
- break;
- case TRUE:
- case FALSE:
- case NULL:
- logger.info(depthPrefix + tree.getValueType().toString());
- break;
- }
- }
-
public void setBundleContext(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 08e344c..7ff000a 100644
--- a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -60,7 +60,7 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="definitionsService" ref="definitionsServiceImpl" auto-export="interfaces"/>
+ <service id="definitionsService" ref="definitionsServiceImpl" interface="org.apache.unomi.api.services.DefinitionsService"/>
<bean id="eventServiceImpl" class="org.apache.unomi.services.services.EventServiceImpl"
init-method="init" destroy-method="destroy">
@@ -89,7 +89,7 @@
<cm:cm-properties persistent-id="org.apache.unomi.thirdparty" update="true" />
</property>
</bean>
- <service id="eventService" ref="eventServiceImpl" auto-export="interfaces"/>
+ <service id="eventService" ref="eventServiceImpl" interface="org.apache.unomi.api.services.EventService"/>
<bean id="goalsServiceImpl" class="org.apache.unomi.services.services.GoalsServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -98,7 +98,7 @@
<property name="rulesService" ref="rulesServiceImpl"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="goalsService" ref="goalsServiceImpl" auto-export="interfaces"/>
+ <service id="goalsService" ref="goalsServiceImpl" interface="org.apache.unomi.api.services.GoalsService"/>
<bean id="actionExecutorDispatcherImpl"
class="org.apache.unomi.services.actions.ActionExecutorDispatcher">
@@ -113,7 +113,7 @@
<property name="actionExecutorDispatcher" ref="actionExecutorDispatcherImpl"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="rulesService" ref="rulesServiceImpl" auto-export="interfaces"/>
+ <service id="rulesService" ref="rulesServiceImpl" interface="org.apache.unomi.api.services.RulesService"/>
<bean id="segmentServiceImpl" class="org.apache.unomi.services.services.SegmentServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -125,7 +125,7 @@
<property name="taskExecutionPeriod" value="86400000"/>
<property name="segmentUpdateBatchSize" value="${services.segment.update.batchSize}" />
</bean>
- <service id="segmentService" ref="segmentServiceImpl" auto-export="interfaces"/>
+ <service id="segmentService" ref="segmentServiceImpl" interface="org.apache.unomi.api.services.SegmentService"/>
<bean id="userListServiceImpl" class="org.apache.unomi.services.services.UserListServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -148,14 +148,14 @@
<property name="purgeSessionsAndEventsTime" value="${services.event.purge.existTime}"/>
<property name="forceRefreshOnSave" value="${services.profile.forceRefreshOnSave}" />
</bean>
- <service id="profileService" ref="profileServiceImpl" auto-export="interfaces"/>
+ <service id="profileService" ref="profileServiceImpl" interface="org.apache.unomi.api.services.ProfileService"/>
<bean id="queryServiceImpl" class="org.apache.unomi.services.services.QueryServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
<property name="persistenceService" ref="persistenceService"/>
<property name="definitionsService" ref="definitionsServiceImpl"/>
</bean>
- <service id="queryService" ref="queryServiceImpl" auto-export="interfaces"/>
+ <service id="queryService" ref="queryServiceImpl" interface="org.apache.unomi.api.services.QueryService"/>
<bean id="clusterServiceImpl" class="org.apache.unomi.services.services.ClusterServiceImpl"
init-method="init" destroy-method="destroy">
@@ -169,7 +169,7 @@
<property name="osgiConfigurationAdmin" ref="osgiConfigurationAdmin" />
<property name="nodeStatisticsUpdateFrequency" value="${cluster.nodeStatisticsUpdateFrequency}" />
</bean>
- <service id="clusterService" ref="clusterServiceImpl" auto-export="interfaces"/>
+ <service id="clusterService" ref="clusterServiceImpl" interface="org.apache.unomi.api.services.ClusterService"/>
<bean id="personalizationServiceImpl" class="org.apache.unomi.services.services.PersonalizationServiceImpl">
@@ -202,7 +202,7 @@
<!-- Property merge strategy executors -->
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="defaultPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -210,7 +210,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="addPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -218,7 +218,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="mostRecentPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -226,7 +226,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="oldestPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -234,7 +234,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="nonEmptyPropertyMergeStrategyExecutor"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7ba62fad/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index ead1758..6fd6ca4 100644
--- a/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -52,7 +52,12 @@
<property name="profileIdCookieMaxAgeInSeconds" value="${web.contextserver.profileIdCookieMaxAgeInSeconds}"/>
</bean>
- <service id="contextServletService" auto-export="interfaces" ref="contextServlet">
+ <service id="contextServletService" ref="contextServlet">
+ <interfaces>
+ <value>javax.servlet.Servlet</value>
+ <value>javax.servlet.ServletConfig</value>
+ <value>java.io.Serializable</value>
+ </interfaces>
<service-properties>
<entry key="urlPatterns">
<array value-type="java.lang.String">
@@ -68,7 +73,12 @@
<property name="eventService" ref="eventService"/>
<property name="privacyService" ref="privacyService" />
</bean>
- <service id="eventsCollectorServletService" auto-export="interfaces" ref="eventsCollectorServlet">
+ <service id="eventsCollectorServletService" ref="eventsCollectorServlet">
+ <interfaces>
+ <value>javax.servlet.Servlet</value>
+ <value>javax.servlet.ServletConfig</value>
+ <value>java.io.Serializable</value>
+ </interfaces>
<service-properties>
<entry key="urlPatterns" value="/eventcollector"/>
</service-properties>
[04/11] incubator-unomi git commit: UNOMI-159 add test to avoid
double load on startup
Posted by sh...@apache.org.
UNOMI-159 add test to avoid double load on startup
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/73774147
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/73774147
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/73774147
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 73774147696a9f2141494d5025c575e3ea1d7760
Parents: 244f0a4
Author: dgaillard <dg...@jahia.com>
Authored: Tue Feb 27 15:59:48 2018 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Tue Feb 27 15:59:48 2018 +0100
----------------------------------------------------------------------
.../unomi/router/services/AbstractConfigurationServiceImpl.java | 2 +-
.../apache/unomi/router/services/AbstractCustomServiceImpl.java | 2 +-
.../org/apache/unomi/services/services/DefinitionsServiceImpl.java | 2 +-
.../java/org/apache/unomi/services/services/GoalsServiceImpl.java | 2 +-
.../org/apache/unomi/services/services/ProfileServiceImpl.java | 2 +-
.../java/org/apache/unomi/services/services/RulesServiceImpl.java | 2 +-
.../org/apache/unomi/services/services/SegmentServiceImpl.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
index 09b1d37..68011eb 100644
--- a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractConfigurationServiceImpl.java
@@ -53,7 +53,7 @@ public abstract class AbstractConfigurationServiceImpl implements SynchronousBun
processBundleStartup(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
index 4e36141..dc06fff 100644
--- a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/AbstractCustomServiceImpl.java
@@ -47,7 +47,7 @@ public class AbstractCustomServiceImpl implements SynchronousBundleListener {
processBundleStartup(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
index 478e11f..9f3c11c 100644
--- a/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
@@ -70,7 +70,7 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
// process already started bundles
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
index 1323cbe..f9bd9c3 100644
--- a/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
@@ -79,7 +79,7 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
loadPredefinedGoals(bundleContext);
loadPredefinedCampaigns(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
loadPredefinedGoals(bundle.getBundleContext());
loadPredefinedCampaigns(bundle.getBundleContext());
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
index b42d8e7..895af37 100644
--- a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
@@ -102,7 +102,7 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
loadPropertyTypesFromPersistence();
processBundleStartup(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
processBundleStartup(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
index aea16aa..d3758ba 100644
--- a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
@@ -100,7 +100,7 @@ public class RulesServiceImpl implements RulesService, EventListenerService, Syn
loadPredefinedRules(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
loadPredefinedRules(bundle.getBundleContext());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73774147/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
index e11f8a6..169efd7 100644
--- a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
@@ -118,7 +118,7 @@ public class SegmentServiceImpl extends AbstractServiceImpl implements SegmentSe
loadPredefinedSegments(bundleContext);
loadPredefinedScorings(bundleContext);
for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
+ if (bundle.getBundleContext() != null && bundle.getBundleId() != bundleContext.getBundle().getBundleId()) {
loadPredefinedSegments(bundle.getBundleContext());
loadPredefinedScorings(bundle.getBundleContext());
}
[02/11] incubator-unomi git commit: UNOMI-153 use send event method
to send other event
Posted by sh...@apache.org.
UNOMI-153 use send event method to send other event
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/33ecebff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/33ecebff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/33ecebff
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 33ecebff21adb0abd01afe433566214211488627
Parents: bd34ae9
Author: dgaillard <dg...@jahia.com>
Authored: Tue Feb 27 14:34:09 2018 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Tue Feb 27 14:34:09 2018 +0100
----------------------------------------------------------------------
.../apache/unomi/services/services/ClusterServiceImpl.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33ecebff/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
index 163812d..65d6095 100644
--- a/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/ClusterServiceImpl.java
@@ -147,8 +147,7 @@ public class ClusterServiceImpl implements ClusterService {
configurations.put(KARAF_CELLAR_CLUSTER_NODE_CONFIGURATION, karafCellarClusterNodeConfiguration);
ClusterConfigurationEvent clusterConfigurationEvent = new ClusterConfigurationEvent(KARAF_CELLAR_CLUSTER_NODE_CONFIGURATION);
- clusterConfigurationEvent.setSourceGroup(group);
- karafCellarEventProducer.produce(clusterConfigurationEvent);
+ sendEvent(clusterConfigurationEvent);
}
nodeStatisticsUpdateTimer = new Timer();
@@ -303,8 +302,6 @@ public class ClusterServiceImpl implements ClusterService {
double systemLoadAverage = operatingSystemMXBean.getSystemLoadAverage();
ClusterSystemStatisticsEvent clusterSystemStatisticsEvent = new ClusterSystemStatisticsEvent("org.apache.unomi.cluster.system.statistics");
- clusterSystemStatisticsEvent.setSourceGroup(group);
- clusterSystemStatisticsEvent.setSourceNode(karafCellarClusterManager.getNode());
Map<String,Serializable> systemStatistics = new TreeMap<>();
ArrayList<Double> systemLoadAverageArray = new ArrayList<>();
systemLoadAverageArray.add(systemLoadAverage);
@@ -313,7 +310,7 @@ public class ClusterServiceImpl implements ClusterService {
systemStatistics.put("uptime", uptime);
clusterSystemStatisticsEvent.setStatistics(systemStatistics);
nodeSystemStatistics.put(karafCellarClusterManager.getNode().getId(), systemStatistics);
- karafCellarEventProducer.produce(clusterSystemStatisticsEvent);
+ sendEvent(clusterSystemStatisticsEvent);
}
}
[08/11] incubator-unomi git commit: UNOMI-5 Upgrade to Karaf 4 -
Upgrading to Karaf 4.1.1, still some issues building the project.
Posted by sh...@apache.org.
UNOMI-5 Upgrade to Karaf 4
- Upgrading to Karaf 4.1.1, still some issues building the project.
Signed-off-by: Serge Huber <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/463193d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/463193d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/463193d2
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 463193d255343b9f882b8b982465464bd82a0568
Parents: 9199f3f
Author: Serge Huber <sh...@apache.org>
Authored: Mon Jun 26 14:39:55 2017 +0200
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Feb 27 16:42:03 2018 +0100
----------------------------------------------------------------------
itests/src/test/java/org/apache/unomi/itests/BaseIT.java | 3 ++-
.../test/java/org/apache/unomi/performancetests/BasicTest.java | 3 ++-
pom.xml | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/463193d2/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
index 2db9834..0cb81cd 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
@@ -46,7 +46,7 @@ public abstract class BaseIT {
MavenArtifactUrlReference karafUrl = maven()
.groupId("org.apache.karaf")
.artifactId("apache-karaf")
- .version("3.0.8")
+ .version("4.1.1")
.type("tar.gz");
MavenUrlReference karafStandardRepo = maven()
@@ -116,6 +116,7 @@ public abstract class BaseIT {
systemProperty("org.apache.unomi.itests.elasticsearch.bootstrap.seccomp").value("false"),
systemProperty("unomi.autoStart").value("true"),
features(karafPaxWebRepo, "shell"),
+ features(karafStandardRepo, "wrap"),
features(karafPaxWebRepo, "war"),
features(karafCxfRepo, "cxf"),
features(karafCellarRepo, "cellar"),
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/463193d2/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
----------------------------------------------------------------------
diff --git a/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java b/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
index 4ed0ea6..d37ff5f 100644
--- a/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
+++ b/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
@@ -82,7 +82,7 @@ public class BasicTest {
MavenArtifactUrlReference karafUrl = maven()
.groupId("org.apache.karaf")
.artifactId("apache-karaf")
- .version("3.0.1")
+ .version("4.1.1")
.type("tar.gz");
MavenUrlReference karafStandardRepo = maven()
@@ -129,6 +129,7 @@ public class BasicTest {
.unpackDirectory(new File("target/exam"))
.useDeployFolder(false),
keepRuntimeFolder(),
+ KarafDistributionOption.features(karafStandardRepo, "wrap")
KarafDistributionOption.features(karafPaxWebRepo, "war"),
KarafDistributionOption.features(karafCxfRepo, "cxf"),
KarafDistributionOption.features(contextServerRepo, "unomi-kar"),
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/463193d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a44ca2..81224c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
<cxf.version>3.1.10</cxf.version>
<version.jackson.core>2.8.6</version.jackson.core>
<version.jackson.jaxb>2.8.6</version.jackson.jaxb>
- <version.karaf>4.0.8</version.karaf>
- <version.karaf.cellar>4.0.3</version.karaf.cellar>
+ <version.karaf>4.1.1</version.karaf>
+ <version.karaf.cellar>4.1.0</version.karaf.cellar>
<version.pax.exam>4.11.2</version.pax.exam>
<elasticsearch.version>5.6.3</elasticsearch.version>
@@ -912,6 +912,7 @@
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${version.karaf}</version>
+ <extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[11/11] incubator-unomi git commit: UNOMI-5 Upgrade to Karaf 4 Rename
feature branch from UNOMI-2.0.0 to UNOMI-5-KARAF4-1
Posted by sh...@apache.org.
UNOMI-5 Upgrade to Karaf 4
Rename feature branch from UNOMI-2.0.0 to UNOMI-5-KARAF4-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/966cf929
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/966cf929
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/966cf929
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 966cf929525c736836d88f4350b553cc22e5677a
Parents: 7a39ca3
Author: Serge Huber <sh...@apache.org>
Authored: Tue Feb 27 16:19:11 2018 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Feb 27 16:42:04 2018 +0100
----------------------------------------------------------------------
api/pom.xml | 2 +-
common/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 ++---
extensions/geonames/services/pom.xml | 8 ++---
extensions/lists-extension/actions/pom.xml | 8 ++---
extensions/lists-extension/pom.xml | 4 +--
extensions/lists-extension/rest/pom.xml | 8 ++---
extensions/lists-extension/services/pom.xml | 8 ++---
extensions/pom.xml | 2 +-
extensions/privacy-extension/pom.xml | 4 +--
extensions/privacy-extension/rest/pom.xml | 8 ++---
extensions/privacy-extension/services/pom.xml | 8 ++---
extensions/router/pom.xml | 2 +-
extensions/router/router-api/pom.xml | 2 +-
extensions/router/router-core/pom.xml | 2 +-
extensions/router/router-karaf-feature/pom.xml | 2 +-
extensions/router/router-rest/pom.xml | 2 +-
extensions/router/router-service/pom.xml | 2 +-
extensions/salesforce-connector/actions/pom.xml | 6 ++--
.../salesforce-connector/karaf-kar/pom.xml | 10 +++---
extensions/salesforce-connector/pom.xml | 2 +-
extensions/salesforce-connector/rest/pom.xml | 8 ++---
.../salesforce-connector/services/pom.xml | 6 ++--
extensions/unomi-mailchimp/actions/pom.xml | 2 +-
extensions/unomi-mailchimp/karaf-kar/pom.xml | 2 +-
extensions/unomi-mailchimp/pom.xml | 2 +-
extensions/unomi-mailchimp/rest/pom.xml | 2 +-
extensions/unomi-mailchimp/services/pom.xml | 2 +-
extensions/weather-update/core/pom.xml | 2 +-
extensions/weather-update/karaf-kar/pom.xml | 4 +--
extensions/weather-update/pom.xml | 2 +-
kar/pom.xml | 38 ++++++++++----------
lifecycle-watcher/pom.xml | 2 +-
metrics/pom.xml | 6 ++--
package/pom.xml | 6 ++--
persistence-elasticsearch/core/pom.xml | 8 ++---
persistence-elasticsearch/pom.xml | 2 +-
persistence-spi/pom.xml | 4 +--
plugins/baseplugin/pom.xml | 6 ++--
plugins/hover-event/pom.xml | 4 +--
plugins/mail/pom.xml | 4 +--
plugins/optimization-test/pom.xml | 2 +-
plugins/past-event/pom.xml | 6 ++--
plugins/pom.xml | 4 +--
plugins/request/pom.xml | 2 +-
plugins/tracked-event/pom.xml | 6 ++--
pom.xml | 2 +-
rest/pom.xml | 6 ++--
samples/login-integration/pom.xml | 4 +--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 8 ++---
tools/pom.xml | 2 +-
tools/shell-commands/pom.xml | 2 +-
tools/shell-dev-commands/pom.xml | 8 ++---
wab/pom.xml | 6 ++--
57 files changed, 139 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 1b890b8..d914b3a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 1c776f2..9cfd5b6 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index e0daf69..c906e3e 100644
--- a/extensions/geonames/pom.xml
+++ b/extensions/geonames/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 5b5b882..7a8ac29 100644
--- a/extensions/geonames/rest/pom.xml
+++ b/extensions/geonames/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index 11f1d68..fbef721 100644
--- a/extensions/geonames/services/pom.xml
+++ b/extensions/geonames/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<artifactId>cxs-geonames-services</artifactId>
<name>Apache Unomi :: Extensions :: Geonames Database :: Service</name>
<description>Service implementation for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/lists-extension/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/actions/pom.xml b/extensions/lists-extension/actions/pom.xml
index 0311e64..8b0b15e 100644
--- a/extensions/lists-extension/actions/pom.xml
+++ b/extensions/lists-extension/actions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,21 +28,21 @@
<name>Apache Unomi :: Extensions :: Lists :: Actions</name>
<description>List extension rule actions for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index e83f0db..c5c25ff 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -28,12 +28,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>cxs-lists-extension</artifactId>
<name>Apache Unomi :: Extensions :: Lists</name>
<description>List extension for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 545688d..0c00008 100644
--- a/extensions/lists-extension/rest/pom.xml
+++ b/extensions/lists-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 79eceec..3f6ce6f 100644
--- a/extensions/lists-extension/services/pom.xml
+++ b/extensions/lists-extension/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<name>Apache Unomi :: Extensions :: Lists :: Service</name>
<description>List extension service implementation for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 2a9d457..fbc1e09 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 1a7317d..8986ab6 100644
--- a/extensions/privacy-extension/pom.xml
+++ b/extensions/privacy-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>cxs-privacy-extension</artifactId>
<name>Apache Unomi :: Extensions :: Privacy</name>
<description>Privacy management extension for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index 3516b5e..e757747 100644
--- a/extensions/privacy-extension/rest/pom.xml
+++ b/extensions/privacy-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index ae0b25c..5716ba3 100644
--- a/extensions/privacy-extension/services/pom.xml
+++ b/extensions/privacy-extension/services/pom.xml
@@ -20,27 +20,27 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cxs-privacy-extension-services</artifactId>
<name>Apache Unomi :: Extensions :: Privacy :: Services</name>
<description>Privacy management extension service implementation for the Apache Unomi Context Server</description>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/router/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/pom.xml b/extensions/router/pom.xml
index 5a40e79..8274182 100644
--- a/extensions/router/pom.xml
+++ b/extensions/router/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-router</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/router/router-api/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/pom.xml b/extensions/router/router-api/pom.xml
index 245d786..73af2a3 100644
--- a/extensions/router/router-api/pom.xml
+++ b/extensions/router/router-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml
index 7c8cad1..54d4861 100644
--- a/extensions/router/router-core/pom.xml
+++ b/extensions/router/router-core/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/router/router-karaf-feature/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-karaf-feature/pom.xml b/extensions/router/router-karaf-feature/pom.xml
index 4c7117d..48e0904 100644
--- a/extensions/router/router-karaf-feature/pom.xml
+++ b/extensions/router/router-karaf-feature/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/router/router-rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-rest/pom.xml b/extensions/router/router-rest/pom.xml
index 505e343..d6c8076 100644
--- a/extensions/router/router-rest/pom.xml
+++ b/extensions/router/router-rest/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/router/router-service/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/pom.xml b/extensions/router/router-service/pom.xml
index ca0c794..db9c2f2 100644
--- a/extensions/router/router-service/pom.xml
+++ b/extensions/router/router-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/salesforce-connector/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/actions/pom.xml b/extensions/salesforce-connector/actions/pom.xml
index 90fca38..f99bd04 100644
--- a/extensions/salesforce-connector/actions/pom.xml
+++ b/extensions/salesforce-connector/actions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/salesforce-connector/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/karaf-kar/pom.xml b/extensions/salesforce-connector/karaf-kar/pom.xml
index c0ac866..88a73e7 100644
--- a/extensions/salesforce-connector/karaf-kar/pom.xml
+++ b/extensions/salesforce-connector/karaf-kar/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -48,17 +48,17 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-rest</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-actions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/salesforce-connector/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/pom.xml b/extensions/salesforce-connector/pom.xml
index 68cda81..1760910 100644
--- a/extensions/salesforce-connector/pom.xml
+++ b/extensions/salesforce-connector/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-salesforce-connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/salesforce-connector/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/rest/pom.xml b/extensions/salesforce-connector/rest/pom.xml
index 616c3b0..df6b627 100644
--- a/extensions/salesforce-connector/rest/pom.xml
+++ b/extensions/salesforce-connector/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/salesforce-connector/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/services/pom.xml b/extensions/salesforce-connector/services/pom.xml
index 270f009..77cedb8 100644
--- a/extensions/salesforce-connector/services/pom.xml
+++ b/extensions/salesforce-connector/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/unomi-mailchimp/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/actions/pom.xml b/extensions/unomi-mailchimp/actions/pom.xml
index 7942c63..2d5a6b6 100644
--- a/extensions/unomi-mailchimp/actions/pom.xml
+++ b/extensions/unomi-mailchimp/actions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector-actions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/unomi-mailchimp/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/karaf-kar/pom.xml b/extensions/unomi-mailchimp/karaf-kar/pom.xml
index 6379bf4..85aa336 100644
--- a/extensions/unomi-mailchimp/karaf-kar/pom.xml
+++ b/extensions/unomi-mailchimp/karaf-kar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector-karaf-kar</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/unomi-mailchimp/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/pom.xml b/extensions/unomi-mailchimp/pom.xml
index 9f02525..4e1b4e3 100644
--- a/extensions/unomi-mailchimp/pom.xml
+++ b/extensions/unomi-mailchimp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/unomi-mailchimp/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/rest/pom.xml b/extensions/unomi-mailchimp/rest/pom.xml
index 800fbf5..1a8d64f 100644
--- a/extensions/unomi-mailchimp/rest/pom.xml
+++ b/extensions/unomi-mailchimp/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/unomi-mailchimp/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/services/pom.xml b/extensions/unomi-mailchimp/services/pom.xml
index 20cc0fb..5f2faa9 100644
--- a/extensions/unomi-mailchimp/services/pom.xml
+++ b/extensions/unomi-mailchimp/services/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-mailchimp-connector</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-mailchimp-connector-services</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/weather-update/core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/core/pom.xml b/extensions/weather-update/core/pom.xml
index 59b5449..9dc27df 100755
--- a/extensions/weather-update/core/pom.xml
+++ b/extensions/weather-update/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-weather-update</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-weather-update-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/weather-update/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/karaf-kar/pom.xml b/extensions/weather-update/karaf-kar/pom.xml
index c1d05ed..4352e8c 100644
--- a/extensions/weather-update/karaf-kar/pom.xml
+++ b/extensions/weather-update/karaf-kar/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-weather-update</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/extensions/weather-update/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/pom.xml b/extensions/weather-update/pom.xml
index e8fe87d..f35198d 100644
--- a/extensions/weather-update/pom.xml
+++ b/extensions/weather-update/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-weather-update</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 09ccadc..211cead 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -42,92 +42,92 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-common</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-metrics</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-actions</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>shell-dev-commands</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/lifecycle-watcher/pom.xml
----------------------------------------------------------------------
diff --git a/lifecycle-watcher/pom.xml b/lifecycle-watcher/pom.xml
index d2029f0..993aada 100644
--- a/lifecycle-watcher/pom.xml
+++ b/lifecycle-watcher/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 470ac11..1450053 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-metrics</artifactId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-common</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index b169045..b18af28 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-karaf-feature</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index f3e44f8..00405eb 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -45,13 +45,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-metrics</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 21cdbac..6069a99 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 4588634..9863fcd 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index a38a486..e7374f5 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index b8f7b9b..af9c997 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 4f1a54b..7320288 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 07120b6..d5190da 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 6c5311b..13ae765 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 37b9dfd..8461c51 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index f8eb0e6..b20ae8a 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index fd3e806..6f14f49 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d78a49..8692ee5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index f35b222..23ca369 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/samples/login-integration/pom.xml
----------------------------------------------------------------------
diff --git a/samples/login-integration/pom.xml b/samples/login-integration/pom.xml
index 91b8b77..a042194 100644
--- a/samples/login-integration/pom.xml
+++ b/samples/login-integration/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>login-integration-sample</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 03b8284..ecfb0a2 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index ffe027f..6271608 100644
--- a/samples/tweet-button-plugin/pom.xml
+++ b/samples/tweet-button-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index acd584d..5d0036b 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-metrics</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index 686f0a4..8d9c0b6 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/tools/shell-commands/pom.xml
----------------------------------------------------------------------
diff --git a/tools/shell-commands/pom.xml b/tools/shell-commands/pom.xml
index 40d35c4..72e561e 100644
--- a/tools/shell-commands/pom.xml
+++ b/tools/shell-commands/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-tools</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>shell-commands</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/tools/shell-dev-commands/pom.xml
----------------------------------------------------------------------
diff --git a/tools/shell-dev-commands/pom.xml b/tools/shell-dev-commands/pom.xml
index 4267045..b40ddc8 100644
--- a/tools/shell-dev-commands/pom.xml
+++ b/tools/shell-dev-commands/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-tools</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>shell-dev-commands</artifactId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-common</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/966cf929/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index bf5f16b..6dd9499 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -47,13 +47,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
+ <version>1.3.0-incubating-unomi_5_karaf4_1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[05/11] incubator-unomi git commit: UNOMI-5 Upgrade to Karaf 4 Lots
of fixes to make sure it works with Karaf 4.1.5: - Update the project from
Karaf 4.1.1 to 4.1.5 - Remove XmlRootElement annotations that were causing
the new CXF version to wrap the obje
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 81224c5..7d78a49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<cxf.version>3.1.10</cxf.version>
<version.jackson.core>2.8.6</version.jackson.core>
<version.jackson.jaxb>2.8.6</version.jackson.jaxb>
- <version.karaf>4.1.1</version.karaf>
+ <version.karaf>4.1.5</version.karaf>
<version.karaf.cellar>4.1.0</version.karaf.cellar>
<version.pax.exam>4.11.2</version.pax.exam>
<elasticsearch.version>5.6.3</elasticsearch.version>
@@ -79,6 +79,16 @@
<gatling.version>2.1.2</gatling.version>
<scala-maven-plugin.version>3.2.0</scala-maven-plugin.version>
+
+ <!-- Librairies for Karaf packaging -->
+ <xerces.version>2.11.0_1</xerces.version>
+ <servicemix.specs.version>2.9.0</servicemix.specs.version>
+ <xalan.bundle.version>2.7.2_3</xalan.bundle.version>
+ <xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
+ <jna.version>4.5.0</jna.version>
+ <httpclient-osgi.version>4.5.5</httpclient-osgi.version>
+ <httpcore-osgi.version>4.4.9</httpcore-osgi.version>
+
</properties>
<mailingLists>
@@ -255,6 +265,30 @@
<id>jahia.3rdparty</id>
<url>https://devtools.jahia.com/nexus/content/repositories/thirdparty-releases/</url>
</repository>
+ <!-- Apache snapshots -->
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://repository.apache.org/content/groups/snapshots-group</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!-- OPS4J SNAPSHOT repository -->
+ <repository>
+ <id>ops4j.sonatype.snapshots.deploy</id>
+ <name>OPS4J snapshot repository</name>
+ <url>https://oss.sonatype.org/content/repositories/ops4j-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<profiles>
@@ -643,7 +677,6 @@
<classifier>features</classifier>
<version>${version.karaf}</version>
<type>xml</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
@@ -705,13 +738,18 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.3.6</version>
+ <version>${httpclient-osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>${httpclient-osgi.version}</version>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.3.3</version>
+ <version>${httpcore-osgi.version}</version>
</dependency>
<!-- Dependencies for pax exam karaf container -->
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 41764cc..01ae5ab 100644
--- a/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -23,7 +23,7 @@
<reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
<!-- Action executor -->
- <service id="trainingNotifAction" auto-export="interfaces">
+ <service id="trainingNotifAction" interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="training"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 7ff000a..f5d20aa 100644
--- a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -133,7 +133,12 @@
<property name="definitionsService" ref="definitionsServiceImpl"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="userListService" ref="userListServiceImpl" auto-export="interfaces"/>
+ <service id="userListService" ref="userListServiceImpl">
+ <interfaces>
+ <value>org.osgi.framework.SynchronousBundleListener</value>
+ <value>org.apache.unomi.api.services.UserListService</value>
+ </interfaces>
+ </service>
<bean id="profileServiceImpl" class="org.apache.unomi.services.services.ProfileServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -176,7 +181,7 @@
<property name="profileService" ref="profileServiceImpl"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="personalizationService" ref="personalizationServiceImpl" auto-export="interfaces"/>
+ <service id="personalizationService" ref="personalizationServiceImpl" interface="org.apache.unomi.api.services.PersonalizationService" />
<!-- We use a listener here because using the list directly for listening to proxies coming from the same bundle didn't seem to work -->
<reference-list id="eventListenerServices"
@@ -242,7 +247,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PersonalizationStrategy">
<service-properties>
<entry key="personalizationStrategyId" value="matching-first"/>
</service-properties>
@@ -251,7 +256,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PersonalizationStrategy">
<service-properties>
<entry key="personalizationStrategyId" value="random"/>
</service-properties>
@@ -260,7 +265,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PersonalizationStrategy">
<service-properties>
<entry key="personalizationStrategyId" value="score-sorted"/>
</service-properties>
@@ -279,7 +284,11 @@
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="configSharingService" ref="configSharingServiceImpl" auto-export="interfaces">
+ <service id="configSharingService" ref="configSharingServiceImpl">
+ <interfaces>
+ <value>org.osgi.framework.SynchronousBundleListener</value>
+ <value>org.apache.unomi.api.services.ConfigSharingService</value>
+ </interfaces>
</service>
<!-- Cluster System Statistics Event Handler -->
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/src/site/markdown/versions/master/custom-extensions.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/custom-extensions.md b/src/site/markdown/versions/master/custom-extensions.md
index 43b3635..6f089ec 100644
--- a/src/site/markdown/versions/master/custom-extensions.md
+++ b/src/site/markdown/versions/master/custom-extensions.md
@@ -292,7 +292,7 @@ content:
<!-- Action executors -->
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="addToLists"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/src/site/markdown/versions/master/twitter-sample.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/twitter-sample.md b/src/site/markdown/versions/master/twitter-sample.md
index 27b0d56..5d6c25c 100644
--- a/src/site/markdown/versions/master/twitter-sample.md
+++ b/src/site/markdown/versions/master/twitter-sample.md
@@ -321,7 +321,7 @@ The action executor references the actual implementation of the action as define
<reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
<!-- Action executor -->
- <service id="incrementTweetNumberAction" auto-export="interfaces">
+ <service id="incrementTweetNumberAction" interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="incrementTweetNumber"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/tools/shell-commands/pom.xml
----------------------------------------------------------------------
diff --git a/tools/shell-commands/pom.xml b/tools/shell-commands/pom.xml
index 3bcbb6e..40d35c4 100644
--- a/tools/shell-commands/pom.xml
+++ b/tools/shell-commands/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>3.0.8</version>
+ <version>${version.karaf}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/ConsoleUtils.java
----------------------------------------------------------------------
diff --git a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/ConsoleUtils.java b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/ConsoleUtils.java
index 0f5cb5c..cae0561 100644
--- a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/ConsoleUtils.java
+++ b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/ConsoleUtils.java
@@ -16,9 +16,9 @@
*/
package org.apache.unomi.shell.migration.utils;
-import jline.console.ConsoleReader;
import org.apache.commons.lang3.StringUtils;
import org.apache.felix.service.command.CommandSession;
+import org.jline.reader.LineReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,7 +77,7 @@ public class ConsoleUtils {
* @throws IOException
*/
public static String promptMessageToUser(CommandSession session, String msg) throws IOException {
- ConsoleReader reader = (ConsoleReader) session.get(".jline.reader");
+ LineReader reader = (LineReader) session.get(".jline.reader");
return reader.readLine(msg, null);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index a7aa6ce..14ba1ce 100644
--- a/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -83,6 +83,6 @@
</property>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="unomiManagementService" ref="unomiManagementServiceImpl" auto-export="interfaces"/>
+ <service id="unomiManagementService" ref="unomiManagementServiceImpl" interface="org.apache.unomi.shell.services.UnomiManagementService" />
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/tools/shell-dev-commands/pom.xml
----------------------------------------------------------------------
diff --git a/tools/shell-dev-commands/pom.xml b/tools/shell-dev-commands/pom.xml
index e719c11..4267045 100644
--- a/tools/shell-dev-commands/pom.xml
+++ b/tools/shell-dev-commands/pom.xml
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>3.0.8</version>
+ <version>${version.karaf}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.table</artifactId>
- <version>3.0.8</version>
+ <version>${version.karaf}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ListCommandSupport.java
----------------------------------------------------------------------
diff --git a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ListCommandSupport.java b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ListCommandSupport.java
index a203aa0..20dde1f 100644
--- a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ListCommandSupport.java
+++ b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ListCommandSupport.java
@@ -18,8 +18,8 @@ package org.apache.unomi.shell.commands;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.apache.karaf.shell.table.Row;
-import org.apache.karaf.shell.table.ShellTable;
+import org.apache.karaf.shell.support.table.Row;
+import org.apache.karaf.shell.support.table.ShellTable;
import org.apache.unomi.common.DataTable;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/ClientServlet.java b/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
index e0aa2e8..f385a53 100644
--- a/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
@@ -96,9 +96,11 @@ public class ClientServlet extends HttpServlet {
public void donwloadCurrentProfile(HttpServletRequest request, HttpServletResponse response, String downloadFileType) throws ServletException, IOException {
String cookieProfileId = null;
Cookie[] cookies = request.getCookies();
- for (Cookie cookie : cookies) {
- if (profileIdCookieName.equals(cookie.getName())) {
- cookieProfileId = cookie.getValue();
+ if (cookies != null) {
+ for (Cookie cookie : cookies) {
+ if (profileIdCookieName.equals(cookie.getName())) {
+ cookieProfileId = cookie.getValue();
+ }
}
}
if (cookieProfileId != null) {
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
index a191855..a507bdd 100644
--- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
@@ -94,9 +94,11 @@ public class ContextServlet extends HttpServlet {
String cookieProfileId = null;
Cookie[] cookies = httpServletRequest.getCookies();
- for (Cookie cookie : cookies) {
- if (profileIdCookieName.equals(cookie.getName())) {
- cookieProfileId = cookie.getValue();
+ if (cookies != null) {
+ for (Cookie cookie : cookies) {
+ if (profileIdCookieName.equals(cookie.getName())) {
+ cookieProfileId = cookie.getValue();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
index 07f24e5..e673289 100644
--- a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
@@ -159,9 +159,11 @@ public class EventsCollectorServlet extends HttpServlet {
} else {
// Session uses anonymous profile, try to find profile from cookie
Cookie[] cookies = request.getCookies();
- for (Cookie cookie : cookies) {
- if (profileIdCookieName.equals(cookie.getName())) {
- profile = profileService.load(cookie.getValue());
+ if (cookies != null) {
+ for (Cookie cookie : cookies) {
+ if (profileIdCookieName.equals(cookie.getName())) {
+ profile = profileService.load(cookie.getValue());
+ }
}
}
if (profile == null) {
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/HttpUtils.java b/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
index 8965aad..5a015d3 100644
--- a/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
+++ b/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
@@ -74,8 +74,12 @@ public class HttpUtils {
public static String dumpRequestCookies(Cookie[] cookies) {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Cookies:\n");
- for (Cookie cookie : cookies) {
- stringBuilder.append(" ").append(cookie.getName()).append("=").append(cookie.getValue()).append(" domain=").append(cookie.getDomain()).append(" path=").append(cookie.getPath()).append(" maxAge=").append(cookie.getMaxAge()).append(" httpOnly=").append(cookie.isHttpOnly()).append(" secure=").append(cookie.getSecure()).append(" version=").append(cookie.getVersion()).append(" comment=").append(cookie.getComment()).append("\n");
+ if (cookies == null) {
+ stringBuilder.append(" none");
+ } else {
+ for (Cookie cookie : cookies) {
+ stringBuilder.append(" ").append(cookie.getName()).append("=").append(cookie.getValue()).append(" domain=").append(cookie.getDomain()).append(" path=").append(cookie.getPath()).append(" maxAge=").append(cookie.getMaxAge()).append(" httpOnly=").append(cookie.isHttpOnly()).append(" secure=").append(cookie.getSecure()).append(" version=").append(cookie.getVersion()).append(" comment=").append(cookie.getComment()).append("\n");
+ }
}
return stringBuilder.toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 6fd6ca4..416d920 100644
--- a/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -90,7 +90,12 @@
<property name="profileIdCookieName" value="${web.contextserver.profileIdCookieName}"/>
</bean>
- <service id="clientServletService" auto-export="interfaces" ref="clientServlet">
+ <service id="clientServletService" ref="clientServlet">
+ <interfaces>
+ <value>javax.servlet.Servlet</value>
+ <value>javax.servlet.ServletConfig</value>
+ <value>java.io.Serializable</value>
+ </interfaces>
<service-properties>
<entry key="urlPatterns" value="/client/*"/>
</service-properties>
[10/11] incubator-unomi git commit: UNOMI-5 Also upgrading to
ElasticSearch 5.2
Posted by sh...@apache.org.
UNOMI-5
Also upgrading to ElasticSearch 5.2
Signed-off-by: Serge Huber <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9199f3f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9199f3f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9199f3f4
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 9199f3f4be778abd7853e4cd63232061f33683e2
Parents: 7ba62fa
Author: Serge Huber <sh...@apache.org>
Authored: Tue Feb 14 10:33:01 2017 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Feb 27 16:42:03 2018 +0100
----------------------------------------------------------------------
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9199f3f4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf3a182..0a44ca2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.1.0</cxf.version>
- <version.jackson.core>2.6.6</version.jackson.core> <!-- version used by CXF -->
- <version.jackson.jaxb>2.6.6</version.jackson.jaxb> <!-- version used by CXF -->
+ <cxf.version>3.1.10</cxf.version>
+ <version.jackson.core>2.8.6</version.jackson.core>
+ <version.jackson.jaxb>2.8.6</version.jackson.jaxb>
<version.karaf>4.0.8</version.karaf>
<version.karaf.cellar>4.0.3</version.karaf.cellar>
<version.pax.exam>4.11.2</version.pax.exam>
[03/11] incubator-unomi git commit: UNOMI-153 add static string for
event ID
Posted by sh...@apache.org.
UNOMI-153 add static string for event ID
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/244f0a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/244f0a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/244f0a49
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 244f0a490faa9180d0f708bef04dcab4aac6c012
Parents: 33ecebf
Author: dgaillard <dg...@jahia.com>
Authored: Tue Feb 27 15:07:37 2018 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Tue Feb 27 15:07:37 2018 +0100
----------------------------------------------------------------------
.../unomi/router/core/context/RouterCamelContext.java | 10 +++++++---
.../router/core/event/UpdateCamelRouteEventHandler.java | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/244f0a49/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
index 03b2e04..309d27a 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
@@ -74,6 +74,10 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
private ConfigSharingService configSharingService;
private ClusterService clusterService;
+ public static String EVENT_ID_REMOVE = "org.apache.unomi.router.event.remove";
+ public static String EVENT_ID_IMPORT = "org.apache.unomi.router.event.import";
+ public static String EVENT_ID_EXPORT = "org.apache.unomi.router.event.export";
+
public void setExecHistorySize(String execHistorySize) {
this.execHistorySize = execHistorySize;
}
@@ -180,7 +184,7 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
}
if (fireEvent) {
- UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.remove");
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent(EVENT_ID_REMOVE);
event.setRouteId(routeId);
clusterService.sendEvent(event);
}
@@ -208,7 +212,7 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
camelContext.addRoutes(builder);
if (fireEvent) {
- UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.import");
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent(EVENT_ID_IMPORT);
event.setConfiguration(importConfiguration);
clusterService.sendEvent(event);
}
@@ -229,7 +233,7 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
camelContext.addRoutes(profileExportCollectRouteBuilder);
if (fireEvent) {
- UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.export");
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent(EVENT_ID_EXPORT);
event.setConfiguration(exportConfiguration);
clusterService.sendEvent(event);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/244f0a49/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
index 6760f4c..c752072 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
@@ -47,9 +47,9 @@ public class UpdateCamelRouteEventHandler extends CellarSupport implements Event
try {
logger.debug("Event id is {}", event.getId());
- if (event.getId().equals("org.apache.unomi.router.event.remove") && StringUtils.isNotBlank(event.getRouteId())) {
+ if (event.getId().equals(RouterCamelContext.EVENT_ID_REMOVE) && StringUtils.isNotBlank(event.getRouteId())) {
routerCamelContext.killExistingRoute(event.getRouteId(), false);
- } else if ((event.getId().equals("org.apache.unomi.router.event.import") || event.getId().equals("org.apache.unomi.router.event.export")) && event.getConfiguration() != null) {
+ } else if ((event.getId().equals(RouterCamelContext.EVENT_ID_IMPORT) || event.getId().equals(RouterCamelContext.EVENT_ID_EXPORT)) && event.getConfiguration() != null) {
routerCamelContext.updateProfileReaderRoute(event.getConfiguration(), false);
}
} catch (Exception e) {
[06/11] incubator-unomi git commit: UNOMI-5 Upgrade to Karaf 4 Lots
of fixes to make sure it works with Karaf 4.1.5: - Update the project from
Karaf 4.1.1 to 4.1.5 - Remove XmlRootElement annotations that were causing
the new CXF version to wrap the obje
Posted by sh...@apache.org.
UNOMI-5 Upgrade to Karaf 4
Lots of fixes to make sure it works with Karaf 4.1.5:
- Update the project from Karaf 4.1.1 to 4.1.5
- Remove XmlRootElement annotations that were causing the new CXF version to wrap the objects
- Remove all auto-exports from Blueprint services declarations as they don't seem to work anymore
- Migrate ConsoleUtils to use a new LineReader (replacing the old ConsoleReader)
- Replace some hardcoded version numbers in Maven POM's with property references
- Replace the old deprecated ShellTable with the new one in the shell commands
- Update the provided configurations with the new settings (log4j2, changes in the karaf shell, removed the startup.properties file)
- Homogenize uses of HttpClient through the whole application
- Replace most hardcoded version numbers in Karaf feature descriptors with property references
- Fix null cookies now returned by new Jetty version
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/7a39ca3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/7a39ca3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/7a39ca3f
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 7a39ca3f065c325dc2211e265fe55ac286ea0535
Parents: 463193d
Author: Serge Huber <sh...@jahia.com>
Authored: Tue Feb 27 13:38:23 2018 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Feb 27 16:42:03 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/unomi/api/EventInfo.java | 3 -
.../java/org/apache/unomi/api/Parameter.java | 2 -
.../java/org/apache/unomi/api/PartialList.java | 2 -
.../java/org/apache/unomi/api/ServerInfo.java | 2 -
.../java/org/apache/unomi/api/ValueType.java | 2 -
.../org/apache/unomi/api/actions/Action.java | 2 -
.../apache/unomi/api/conditions/Condition.java | 2 -
.../unomi/api/conditions/ConditionType.java | 12 +-
.../org/apache/unomi/api/lists/UserList.java | 3 -
.../unomi/api/segments/DependentMetadata.java | 2 -
.../org/apache/unomi/api/segments/Scoring.java | 2 -
.../unomi/api/segments/ScoringElement.java | 2 -
.../org/apache/unomi/api/segments/Segment.java | 3 -
common/pom.xml | 4 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../java/org/apache/unomi/lists/UserList.java | 3 -
.../src/main/feature/feature.xml | 21 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 26 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 4 +-
.../salesforce-connector/karaf-kar/pom.xml | 2 -
.../karaf-kar/src/main/feature/feature.xml | 4 +-
.../salesforce-connector/services/pom.xml | 1 -
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 6 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
extensions/weather-update/core/pom.xml | 2 -
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
extensions/weather-update/karaf-kar/pom.xml | 2 -
.../karaf-kar/src/main/feature/feature.xml | 4 +-
.../java/org/apache/unomi/itests/BaseIT.java | 2 +-
kar/pom.xml | 8 +
metrics/pom.xml | 4 +-
.../unomi/metrics/commands/ListCommand.java | 4 +-
package/pom.xml | 399 ++++++++++---------
.../src/main/resources/etc/custom.properties | 2 +
.../resources/etc/org.apache.karaf.shell.cfg | 47 ++-
.../resources/etc/org.ops4j.pax.logging.cfg | 109 +++--
.../src/main/resources/etc/startup.properties | 59 ---
.../unomi/performancetests/BasicTest.java | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 4 +-
plugins/request/pom.xml | 8 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
pom.xml | 46 ++-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 21 +-
.../versions/master/custom-extensions.md | 2 +-
.../markdown/versions/master/twitter-sample.md | 2 +-
tools/shell-commands/pom.xml | 2 +-
.../shell/migration/utils/ConsoleUtils.java | 4 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
tools/shell-dev-commands/pom.xml | 4 +-
.../shell/commands/ListCommandSupport.java | 4 +-
.../org/apache/unomi/web/ClientServlet.java | 8 +-
.../org/apache/unomi/web/ContextServlet.java | 8 +-
.../unomi/web/EventsCollectorServlet.java | 8 +-
.../java/org/apache/unomi/web/HttpUtils.java | 8 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 7 +-
57 files changed, 490 insertions(+), 414 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/EventInfo.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/EventInfo.java b/api/src/main/java/org/apache/unomi/api/EventInfo.java
index b78e727..543d6d9 100644
--- a/api/src/main/java/org/apache/unomi/api/EventInfo.java
+++ b/api/src/main/java/org/apache/unomi/api/EventInfo.java
@@ -17,12 +17,9 @@
package org.apache.unomi.api;
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* Basic event information
*/
-@XmlRootElement
public class EventInfo {
private String name;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/Parameter.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/Parameter.java b/api/src/main/java/org/apache/unomi/api/Parameter.java
index f35ac45..c4d7d99 100644
--- a/api/src/main/java/org/apache/unomi/api/Parameter.java
+++ b/api/src/main/java/org/apache/unomi/api/Parameter.java
@@ -17,14 +17,12 @@
package org.apache.unomi.api;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
/**
* A representation of a condition parameter, to be used in the segment building UI to either select parameters from a
* choicelist or to enter a specific value.
*/
-@XmlRootElement
public class Parameter implements Serializable {
private static final long serialVersionUID = 7446061538573517071L;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/PartialList.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/PartialList.java b/api/src/main/java/org/apache/unomi/api/PartialList.java
index daa69c9..a78eb73 100644
--- a/api/src/main/java/org/apache/unomi/api/PartialList.java
+++ b/api/src/main/java/org/apache/unomi/api/PartialList.java
@@ -17,7 +17,6 @@
package org.apache.unomi.api;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import java.io.Serializable;
import java.util.ArrayList;
@@ -29,7 +28,6 @@ import java.util.List;
*
* @param <T> the generic type of contained elements
*/
-@XmlRootElement
public class PartialList<T> implements Serializable {
private static final long serialVersionUID = 2661946814840468260L;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/ServerInfo.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/ServerInfo.java b/api/src/main/java/org/apache/unomi/api/ServerInfo.java
index f9d2001..2006a1f 100644
--- a/api/src/main/java/org/apache/unomi/api/ServerInfo.java
+++ b/api/src/main/java/org/apache/unomi/api/ServerInfo.java
@@ -17,14 +17,12 @@
package org.apache.unomi.api;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
import java.util.Map;
/**
* Basic information about a Unomi server
*/
-@XmlRootElement
public class ServerInfo {
private String serverIdentifier;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/ValueType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/ValueType.java b/api/src/main/java/org/apache/unomi/api/ValueType.java
index d90321d..16e1eac 100644
--- a/api/src/main/java/org/apache/unomi/api/ValueType.java
+++ b/api/src/main/java/org/apache/unomi/api/ValueType.java
@@ -17,7 +17,6 @@
package org.apache.unomi.api;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -25,7 +24,6 @@ import java.util.Set;
/**
* A value type to be used to constrain property values.
*/
-@XmlRootElement
public class ValueType implements PluginType {
private String id;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/actions/Action.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/actions/Action.java b/api/src/main/java/org/apache/unomi/api/actions/Action.java
index 5c40e5a..b3505bb 100644
--- a/api/src/main/java/org/apache/unomi/api/actions/Action.java
+++ b/api/src/main/java/org/apache/unomi/api/actions/Action.java
@@ -20,7 +20,6 @@ package org.apache.unomi.api.actions;
import org.apache.unomi.api.rules.Rule;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import java.io.Serializable;
import java.util.HashMap;
@@ -30,7 +29,6 @@ import java.util.Map;
* An action that can be executed as a consequence of a {@link Rule} being triggered. An action is characterized by its associated {@link
* ActionType} and parameter values.
*/
-@XmlRootElement
public class Action implements Serializable {
private ActionType actionType;
private String actionTypeId;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/conditions/Condition.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/conditions/Condition.java b/api/src/main/java/org/apache/unomi/api/conditions/Condition.java
index b5b8e6c..541ef4b 100644
--- a/api/src/main/java/org/apache/unomi/api/conditions/Condition.java
+++ b/api/src/main/java/org/apache/unomi/api/conditions/Condition.java
@@ -18,7 +18,6 @@
package org.apache.unomi.api.conditions;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import java.io.Serializable;
import java.util.HashMap;
@@ -27,7 +26,6 @@ import java.util.Map;
/**
* A set of elements that can be evaluated.
*/
-@XmlRootElement
public class Condition implements Serializable {
ConditionType conditionType;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java b/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java
index 4fd8354..c8a4322 100644
--- a/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java
+++ b/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java
@@ -17,14 +17,13 @@
package org.apache.unomi.api.conditions;
-import org.apache.unomi.api.*;
-import org.apache.unomi.api.rules.Rule;
+import org.apache.unomi.api.Metadata;
+import org.apache.unomi.api.MetadataItem;
+import org.apache.unomi.api.Parameter;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
/**
* ConditionTypes define new conditions that can be applied to items (for example to decide whether a rule needs to be triggered or if a profile is considered as taking part in a
@@ -32,7 +31,6 @@ import java.util.*;
* optimized by coding it. They may also be defined as combination of other conditions. A simple condition could be: “User is male”, while a more generic condition with
* parameters may test whether a given property has a specific value: “User property x has value y”.
*/
-@XmlRootElement
public class ConditionType extends MetadataItem {
public static final String ITEM_TYPE = "conditionType";
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/lists/UserList.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/lists/UserList.java b/api/src/main/java/org/apache/unomi/api/lists/UserList.java
index d463a58..dc82b89 100644
--- a/api/src/main/java/org/apache/unomi/api/lists/UserList.java
+++ b/api/src/main/java/org/apache/unomi/api/lists/UserList.java
@@ -21,12 +21,9 @@ import org.apache.unomi.api.Item;
import org.apache.unomi.api.Metadata;
import org.apache.unomi.api.MetadataItem;
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* Created by amidani on 24/03/2017.
*/
-@XmlRootElement
public class UserList extends MetadataItem{
/**
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/segments/DependentMetadata.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/segments/DependentMetadata.java b/api/src/main/java/org/apache/unomi/api/segments/DependentMetadata.java
index a6693f3..1830c1e 100644
--- a/api/src/main/java/org/apache/unomi/api/segments/DependentMetadata.java
+++ b/api/src/main/java/org/apache/unomi/api/segments/DependentMetadata.java
@@ -19,11 +19,9 @@ package org.apache.unomi.api.segments;
import org.apache.unomi.api.Metadata;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
-@XmlRootElement
public class DependentMetadata implements Serializable {
private List<Metadata> segments;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/segments/Scoring.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/segments/Scoring.java b/api/src/main/java/org/apache/unomi/api/segments/Scoring.java
index f9bb577..6018fb3 100644
--- a/api/src/main/java/org/apache/unomi/api/segments/Scoring.java
+++ b/api/src/main/java/org/apache/unomi/api/segments/Scoring.java
@@ -22,14 +22,12 @@ import org.apache.unomi.api.Metadata;
import org.apache.unomi.api.MetadataItem;
import org.apache.unomi.api.Profile;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
/**
* A set of conditions associated with a value to assign to {@link Profile}s when matching so that the associated users can be scored along that
* dimension. Each {@link ScoringElement} is evaluated and matching profiles' scores are incremented with the associated value.
*/
-@XmlRootElement
public class Scoring extends MetadataItem {
/**
* The Scoring ITEM_TYPE.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/segments/ScoringElement.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/segments/ScoringElement.java b/api/src/main/java/org/apache/unomi/api/segments/ScoringElement.java
index dcc8046..1af5147 100644
--- a/api/src/main/java/org/apache/unomi/api/segments/ScoringElement.java
+++ b/api/src/main/java/org/apache/unomi/api/segments/ScoringElement.java
@@ -19,13 +19,11 @@ package org.apache.unomi.api.segments;
import org.apache.unomi.api.conditions.Condition;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
/**
* A scoring dimension along profiles can be evaluated and associated value to be assigned.
*/
-@XmlRootElement
public class ScoringElement implements Serializable {
private Condition condition;
private int value;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/api/src/main/java/org/apache/unomi/api/segments/Segment.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/segments/Segment.java b/api/src/main/java/org/apache/unomi/api/segments/Segment.java
index 2b463bf..4e0d338 100644
--- a/api/src/main/java/org/apache/unomi/api/segments/Segment.java
+++ b/api/src/main/java/org/apache/unomi/api/segments/Segment.java
@@ -23,14 +23,11 @@ import org.apache.unomi.api.MetadataItem;
import org.apache.unomi.api.Profile;
import org.apache.unomi.api.conditions.Condition;
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* A dynamically evaluated group of similar profiles in order to categorize the associated users. To be considered part of a given segment, users must satisfies
* the segment’s condition. If they match, users are automatically added to the segment. Similarly, if at any given point during, they cease to satisfy the segment’s condition,
* they are automatically removed from it.
*/
-@XmlRootElement
public class Segment extends MetadataItem {
/**
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 95f31dc..1c776f2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -44,14 +44,14 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>3.0.8</version>
+ <version>${version.karaf}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.table</artifactId>
- <version>3.0.8</version>
+ <version>${version.karaf}</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 386fbe0..7a55241 100644
--- a/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -24,7 +24,7 @@
<!-- Action executors -->
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="addToLists"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/lists-extension/services/src/main/java/org/apache/unomi/lists/UserList.java
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/src/main/java/org/apache/unomi/lists/UserList.java b/extensions/lists-extension/services/src/main/java/org/apache/unomi/lists/UserList.java
index e9ab509..02b54cb 100644
--- a/extensions/lists-extension/services/src/main/java/org/apache/unomi/lists/UserList.java
+++ b/extensions/lists-extension/services/src/main/java/org/apache/unomi/lists/UserList.java
@@ -19,12 +19,9 @@ package org.apache.unomi.lists;
import org.apache.unomi.api.Metadata;
import org.apache.unomi.api.MetadataItem;
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Christophe Laprun
*/
-@XmlRootElement
public class UserList extends MetadataItem {
public static final String ITEM_TYPE = "userList";
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/router/router-karaf-feature/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-karaf-feature/src/main/feature/feature.xml b/extensions/router/router-karaf-feature/src/main/feature/feature.xml
index 7578677..b513115 100644
--- a/extensions/router/router-karaf-feature/src/main/feature/feature.xml
+++ b/extensions/router/router-karaf-feature/src/main/feature/feature.xml
@@ -15,22 +15,23 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="unomi-router-karaf-feature">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0" name="unomi-router-karaf-feature">
<feature name="unomi-router-karaf-feature" version="${project.version}" description="Apache Unomi :: Extensions :: Router :: Apache Karaf Feature">
<details>Apache Karaf feature for the Apache Unomi Context Server extension</details>
<feature>unomi-kar</feature>
<bundle start-level="90">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/0.1.54_1</bundle>
<bundle start-level="90">mvn:commons-net/commons-net/3.5</bundle>
<bundle start-level="90">wrap:mvn:org.apache.kafka/kafka-clients/0.10.1.0</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-core/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-core-osgi/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-blueprint/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-jackson/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-http-common/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-ftp/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-stream/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.camel/camel-kafka/2.19.1</bundle>
- <bundle start-level="90">mvn:org.apache.cxf/cxf-rt-rs-security-cors/3.0.2</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-core/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-core-osgi/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-blueprint/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-jackson/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-http-common/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-servlet/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-ftp/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-stream/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.camel/camel-kafka/${camel.version}</bundle>
+ <bundle start-level="90">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}</bundle>
<bundle start-level="90" start="false">mvn:org.apache.unomi/unomi-router-api/${project.version}</bundle>
<bundle start-level="90" start="false">mvn:org.apache.unomi/unomi-router-core/${project.version}</bundle>
<bundle start-level="90" start="false">mvn:org.apache.unomi/unomi-router-service/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index abbc72d..c00554c 100644
--- a/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -28,7 +28,11 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="importConfigurationService" ref="importConfigurationServiceImpl" auto-export="interfaces">
+ <service id="importConfigurationService" ref="importConfigurationServiceImpl">
+ <interfaces>
+ <value>org.apache.unomi.router.api.services.ImportExportConfigurationService</value>
+ <value>org.osgi.framework.SynchronousBundleListener</value>
+ </interfaces>
<service-properties>
<entry key="configDiscriminator" value="IMPORT"/>
</service-properties>
@@ -39,7 +43,11 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="exportConfigurationService" ref="exportConfigurationServiceImpl" auto-export="interfaces">
+ <service id="exportConfigurationService" ref="exportConfigurationServiceImpl">
+ <interfaces>
+ <value>org.osgi.framework.SynchronousBundleListener</value>
+ <value>org.apache.unomi.router.api.services.ImportExportConfigurationService</value>
+ </interfaces>
<service-properties>
<entry key="configDiscriminator" value="EXPORT"/>
</service-properties>
@@ -50,7 +58,12 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="profileImportService" ref="profileImportServiceImpl" auto-export="interfaces"/>
+ <service id="profileImportService" ref="profileImportServiceImpl">
+ <interfaces>
+ <value>org.osgi.framework.SynchronousBundleListener</value>
+ <value>org.apache.unomi.router.api.services.ProfileImportService</value>
+ </interfaces>
+ </service>
<bean id="profileExportServiceImpl" class="org.apache.unomi.router.services.ProfileExportServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -58,6 +71,11 @@
<property name="configSharingService" ref="configSharingService" />
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="profileExportService" ref="profileExportServiceImpl" auto-export="interfaces"/>
+ <service id="profileExportService" ref="profileExportServiceImpl">
+ <interfaces>
+ <value>org.osgi.framework.SynchronousBundleListener</value>
+ <value>org.apache.unomi.router.api.services.ProfileExportService</value>
+ </interfaces>
+ </service>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/salesforce-connector/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/salesforce-connector/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 24b61ff..3d0e50e 100644
--- a/extensions/salesforce-connector/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/salesforce-connector/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -23,7 +23,7 @@
<reference id="sfdcService"
interface="org.apache.unomi.sfdc.services.SFDCService"/>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="sfdcCreateOrUpdateLead"/>
</service-properties>
@@ -32,7 +32,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="sfdcUpdateProfileFromLead"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/salesforce-connector/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/karaf-kar/pom.xml b/extensions/salesforce-connector/karaf-kar/pom.xml
index dd391f3..c0ac866 100644
--- a/extensions/salesforce-connector/karaf-kar/pom.xml
+++ b/extensions/salesforce-connector/karaf-kar/pom.xml
@@ -40,12 +40,10 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.4.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml b/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
index 1c74c7d..d3fbc36 100644
--- a/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
@@ -19,8 +19,8 @@
<feature name="unomi-salesforce-connector-karaf-kar" version="${project.version}" description="Apache Unomi :: Extensions :: Salesforce connector :: Apache Karaf Feature">
<details>Apache Karaf feature for the Apache Unomi Context Server extension that integrates with Salesforce</details>
<configfile finalname="/etc/org.apache.unomi.sfdc.cfg">mvn:org.apache.unomi/unomi-salesforce-connector-services/${project.version}/cfg/sfdccfg</configfile>
- <bundle start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
- <bundle start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
+ <bundle start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore-osgi.version}</bundle>
+ <bundle start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-osgi.version}</bundle>
<bundle start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-services/${project.version}</bundle>
<bundle start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-rest/${project.version}</bundle>
<bundle start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-actions/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/salesforce-connector/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/services/pom.xml b/extensions/salesforce-connector/services/pom.xml
index 87d3395..270f009 100644
--- a/extensions/salesforce-connector/services/pom.xml
+++ b/extensions/salesforce-connector/services/pom.xml
@@ -52,7 +52,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.5.1</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/salesforce-connector/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/salesforce-connector/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index e6603c2..011f851 100644
--- a/extensions/salesforce-connector/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/salesforce-connector/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -65,6 +65,6 @@
<property name="persistenceService" ref="persistenceService" />
</bean>
- <service id="sfdcService" ref="sfdcServiceImpl" auto-export="interfaces"/>
+ <service id="sfdcService" ref="sfdcServiceImpl" interface="org.apache.unomi.sfdc.services.SFDCService"/>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/unomi-mailchimp/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/unomi-mailchimp/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index b8b0f01..d7376d6 100644
--- a/extensions/unomi-mailchimp/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/unomi-mailchimp/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -23,7 +23,7 @@
<reference id="mailChimpService"
interface="org.apache.unomi.mailchimp.services.MailChimpService"/>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="addVisitorToMailChimpList"/>
</service-properties>
@@ -32,7 +32,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="removeVisitorFromMailChimpList"/>
</service-properties>
@@ -41,7 +41,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="unsubscribeVisitorFromMailChimpList"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/unomi-mailchimp/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/unomi-mailchimp/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/unomi-mailchimp/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 614937f..6f88470 100644
--- a/extensions/unomi-mailchimp/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/unomi-mailchimp/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -38,7 +38,7 @@
<property name="isMergeFieldsActivate" value="${mailChimpConnector.list.merge-fields.activate}"/>
</bean>
- <service id="mailChimpService" ref="mailChimpServiceImpl" auto-export="interfaces"/>
+ <service id="mailChimpService" ref="mailChimpServiceImpl" interface="org.apache.unomi.mailchimp.services.MailChimpService" />
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/weather-update/core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/core/pom.xml b/extensions/weather-update/core/pom.xml
index 686b9d3..59b5449 100755
--- a/extensions/weather-update/core/pom.xml
+++ b/extensions/weather-update/core/pom.xml
@@ -39,13 +39,11 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.5.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.4.6</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/weather-update/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/weather-update/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 0339ce8..e21d744 100755
--- a/extensions/weather-update/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/weather-update/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -31,7 +31,7 @@
</cm:property-placeholder>
<!-- Action executor -->
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="weatherUpdate"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/weather-update/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/karaf-kar/pom.xml b/extensions/weather-update/karaf-kar/pom.xml
index 229c02c..c1d05ed 100644
--- a/extensions/weather-update/karaf-kar/pom.xml
+++ b/extensions/weather-update/karaf-kar/pom.xml
@@ -39,12 +39,10 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.4.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.5.1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/karaf-kar/src/main/feature/feature.xml b/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
index 2f005a6..34b46bb 100644
--- a/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
@@ -21,8 +21,8 @@
<details>Apache Karaf feature for the Apache Unomi Context Server extension that integrates Weather
update</details>
<configfile finalname="/etc/org.apache.unomi.weatherUpdate.cfg">mvn:org.apache.unomi/unomi-weather-update-core/${project.version}/cfg/weatherupdatecfg</configfile>
- <bundle start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
- <bundle start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
+ <bundle start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore-osgi.version}</bundle>
+ <bundle start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-osgi.version}</bundle>
<bundle start-level="85">mvn:org.apache.unomi/unomi-weather-update-core/${project.version}</bundle>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
index 0cb81cd..5c9d6ae 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
@@ -46,7 +46,7 @@ public abstract class BaseIT {
MavenArtifactUrlReference karafUrl = maven()
.groupId("org.apache.karaf")
.artifactId("apache-karaf")
- .version("4.1.1")
+ .version("4.1.5")
.type("tar.gz");
MavenUrlReference karafStandardRepo = maven()
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 8db7bdd..09ccadc 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -32,6 +32,14 @@
<dependencies>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
<version>1.3.0-incubating-unomi_2.0.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 754a960..470ac11 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>3.0.8</version>
+ <version>${version.karaf}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.table</artifactId>
- <version>3.0.8</version>
+ <version>${version.karaf}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/metrics/src/main/java/org/apache/unomi/metrics/commands/ListCommand.java
----------------------------------------------------------------------
diff --git a/metrics/src/main/java/org/apache/unomi/metrics/commands/ListCommand.java b/metrics/src/main/java/org/apache/unomi/metrics/commands/ListCommand.java
index c7e1eb8..f003afb 100644
--- a/metrics/src/main/java/org/apache/unomi/metrics/commands/ListCommand.java
+++ b/metrics/src/main/java/org/apache/unomi/metrics/commands/ListCommand.java
@@ -18,8 +18,8 @@ package org.apache.unomi.metrics.commands;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.shell.table.Row;
-import org.apache.karaf.shell.table.ShellTable;
+import org.apache.karaf.shell.support.table.Row;
+import org.apache.karaf.shell.support.table.ShellTable;
import org.apache.unomi.common.DataTable;
import org.apache.unomi.metrics.Metric;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index ae5afd7..b169045 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -39,13 +39,11 @@
<!-- Standard Apache Karaf Features -->
<dependency>
- <!-- scope is compile so all features (there is only one) are installed into startup.properties and the feature repo itself is not installed -->
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<type>kar</type>
</dependency>
<dependency>
- <!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration -->
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<classifier>features</classifier>
@@ -127,6 +125,138 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-deploy-by-query-plugin</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.elasticsearch.plugin</groupId>
+ <artifactId>reindex-client</artifactId>
+ <version>${elasticsearch.version}</version>
+ <outputDirectory>${project.build.directory}/assembly/elasticsearch/modules/reindex</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-wab</artifactId>
+ <version>${project.version}</version>
+ <classifier>unomicfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.web.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-persistence-elasticsearch-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>elasticsearchcfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.persistence.elasticsearch.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-services</artifactId>
+ <version>${project.version}</version>
+ <classifier>hazelcastconfig</classifier>
+ <type>xml</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>hazelcast.xml</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-services</artifactId>
+ <version>${project.version}</version>
+ <classifier>clustercfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.cluster.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-services</artifactId>
+ <version>${project.version}</version>
+ <classifier>servicescfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.services.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-plugins-request</artifactId>
+ <version>${project.version}</version>
+ <classifier>requestcfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.plugins.request.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-plugins-mail</artifactId>
+ <version>${project.version}</version>
+ <classifier>mailcfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.plugins.mail.cfg</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>routercfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.router.cfg</destFileName>
+ </artifactItem>
+ <!-- UNOMI-75 : We install the blueprint core bundle in a different version to fix a problem with offline startup -->
+ <artifactItem>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>1.6.2</version>
+ <outputDirectory>
+ ${project.build.directory}/assembly/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/1.6.2
+ </outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <!-- other configurations here -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -144,6 +274,78 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-kar</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package</id>
+ <goals>
+ <goal>archive</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <installedFeatures>
+ <feature>wrapper</feature>
+ </installedFeatures>
+ <startupFeatures>
+ <feature>eventadmin</feature>
+ </startupFeatures>
+ <bootFeatures>
+ <feature>wrap</feature>
+ <feature>shell</feature>
+ <feature>feature</feature>
+ <feature>jaas</feature>
+ <feature>ssh</feature>
+ <feature>management</feature>
+ <feature>bundle</feature>
+ <feature>config</feature>
+ <feature>deployer</feature>
+ <feature>diagnostic</feature>
+ <feature>feature</feature>
+ <feature>instance</feature>
+ <feature>kar</feature>
+ <feature>log</feature>
+ <feature>package</feature>
+ <feature>service</feature>
+ <feature>system</feature>
+ <feature>war</feature>
+ <feature>cxf</feature>
+ <feature>cellar</feature>
+ <feature>aries-blueprint</feature>
+ <feature>shell-compat</feature>
+ <feature>unomi-kar</feature>
+ <feature>unomi-router-karaf-feature</feature>
+ </bootFeatures>
+ <libraries>
+ <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true;delegate:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true</library>
+ <library>mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true</library>
+
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library>
+
+ <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
+ <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
+ </libraries>
+ <javase>1.8</javase>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -173,199 +375,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>binary</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-deploy-by-query-plugin</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.elasticsearch.plugin</groupId>
- <artifactId>reindex-client</artifactId>
- <version>${elasticsearch.version}</version>
- <outputDirectory>${project.build.directory}/assembly/elasticsearch/modules/reindex</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-wab</artifactId>
- <version>${project.version}</version>
- <classifier>unomicfg</classifier>
- <type>cfg</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>org.apache.unomi.web.cfg</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>${project.version}</version>
- <classifier>elasticsearchcfg</classifier>
- <type>cfg</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>org.apache.unomi.persistence.elasticsearch.cfg</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-services</artifactId>
- <version>${project.version}</version>
- <classifier>hazelcastconfig</classifier>
- <type>xml</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>hazelcast.xml</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-services</artifactId>
- <version>${project.version}</version>
- <classifier>clustercfg</classifier>
- <type>cfg</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>org.apache.unomi.cluster.cfg</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-services</artifactId>
- <version>${project.version}</version>
- <classifier>servicescfg</classifier>
- <type>cfg</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>org.apache.unomi.services.cfg</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-plugins-request</artifactId>
- <version>${project.version}</version>
- <classifier>requestcfg</classifier>
- <type>cfg</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>org.apache.unomi.plugins.request.cfg</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-plugins-mail</artifactId>
- <version>${project.version}</version>
- <classifier>mailcfg</classifier>
- <type>cfg</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>org.apache.unomi.plugins.mail.cfg</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-core</artifactId>
- <version>${project.version}</version>
- <classifier>routercfg</classifier>
- <type>cfg</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>org.apache.unomi.router.cfg</destFileName>
- </artifactItem>
- <!-- UNOMI-75 : We install the blueprint core bundle in a different version to fix a problem with offline startup -->
- <artifactItem>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.6.2</version>
- <outputDirectory>
- ${project.build.directory}/assembly/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/1.6.2
- </outputDirectory>
- </artifactItem>
- </artifactItems>
- <!-- other configurations here -->
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>process-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- <execution>
- <id>package</id>
- <goals>
- <goal>archive</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <installedFeatures>
- <feature>wrapper</feature>
- </installedFeatures>
- <bootFeatures>
- <feature>framework</feature>
- <feature>wrap</feature>
- <feature>aries-blueprint</feature>
- <feature>shell</feature>
- <feature>shell-compat</feature>
- <feature>feature</feature>
- <feature>jaas</feature>
- <feature>ssh</feature>
- <feature>management</feature>
- <feature>bundle</feature>
- <feature>config</feature>
- <feature>deployer</feature>
- <feature>diagnostic</feature>
- <feature>feature</feature>
- <feature>instance</feature>
- <feature>kar</feature>
- <feature>log</feature>
- <feature>package</feature>
- <feature>service</feature>
- <feature>system</feature>
- <feature>war</feature>
- <feature>cxf</feature>
- <feature>cellar</feature>
- <feature>unomi-kar</feature>
- <feature>unomi-router-karaf-feature</feature>
- </bootFeatures>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/package/src/main/resources/etc/custom.properties
----------------------------------------------------------------------
diff --git a/package/src/main/resources/etc/custom.properties b/package/src/main/resources/etc/custom.properties
index 06484da..06e70ff 100644
--- a/package/src/main/resources/etc/custom.properties
+++ b/package/src/main/resources/etc/custom.properties
@@ -1,3 +1,4 @@
+################################################################################
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -14,6 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+################################################################################
#
# All the values specified here will override the default values given
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/package/src/main/resources/etc/org.apache.karaf.shell.cfg
----------------------------------------------------------------------
diff --git a/package/src/main/resources/etc/org.apache.karaf.shell.cfg b/package/src/main/resources/etc/org.apache.karaf.shell.cfg
index 2f0ee02..5630c9a 100644
--- a/package/src/main/resources/etc/org.apache.karaf.shell.cfg
+++ b/package/src/main/resources/etc/org.apache.karaf.shell.cfg
@@ -1,3 +1,4 @@
+
################################################################################
#
# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,12 +40,28 @@ sshIdleTimeout = 1800000
sshRealm = karaf
#
+# Defines if the SFTP system is enabled or not in the SSH server
+#
+sftpEnabled=true
+
+#
# The location of the hostKey file defines where the private/public key of the server
# is located. If no file is at the defined location it will be ignored.
#
hostKey = ${karaf.etc}/host.key
#
+# The format used for hostKey.
+# Possible values are simple (Karaf internal), or PEM (OpenSSH format)
+#
+hostKeyFormat = simple
+
+#
+# shRole defines the role required to access the console through ssh
+#
+sshRole = ssh
+
+#
# Self defined key size in 1024, 2048, 3072, or 4096
# If not set, this defaults to 4096.
#
@@ -81,24 +98,30 @@ hostKey = ${karaf.etc}/host.key
# This property define the default value when you use the Karaf shell console.
# You can change the completion mode directly in the shell console, using shell:completion command.
#
-completionMode = GLOBAL
#
-# Enable the console logger.
-# The console logger allows to generate log messages for all actions/commands performed in the shell console.
-#
-# consoleLogger property enable/disable the logger. The logger is disabled by default
+# Override allowed SSH cipher algorithms.
+# Default: aes128-ctr,arcfour128,aes128-cbc,3des-cbc,blowfish-cbc
#
-consoleLogger = false
+# ciphers = aes128-ctr,arcfour128,aes128-cbc,3des-cbc,blowfish-cbc
+
#
-# consoleLoggerName allows you to define the logger name used for the log messages
+# Override allowed SSH HMAC algorithms.
+# Default: hmac-sha2-512,hmac-sha2-256,hmac-sha1
#
-consoleLoggerName = org.apache.karaf.shell.console.Logger
+# macs = hmac-sha2-512,hmac-sha2-256,hmac-sha1
+
#
-# consoleLoggerOutLevel allows you to define the log level for the log messages corresponding to the System.out stream
+# Override allowed SSH key exchange algorithms.
+# Default: diffie-hellman-group-exchange-sha256,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1
#
-consoleLoggerOutLevel = debug
+# kexAlgorithms = diffie-hellman-group-exchange-sha256,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1
+
#
-# consoleLoggerErrLevel allows you to define the log level for the log messages corresponding to the System.err stream
+# Override moduli-url.
+# Default: moduli-url not specified to use the internal one from SSHD
#
-consoleLoggerErrLevel = error
+# moduli-url = external moduli-url users wanna use
+
+completionMode = GLOBAL
+
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/package/src/main/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/package/src/main/resources/etc/org.ops4j.pax.logging.cfg b/package/src/main/resources/etc/org.ops4j.pax.logging.cfg
index 99db1db..543c181 100644
--- a/package/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ b/package/src/main/resources/etc/org.ops4j.pax.logging.cfg
@@ -1,3 +1,4 @@
+################################################################################
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -14,34 +15,84 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+################################################################################
+
+# Common pattern layout for appenders
+log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
# Root logger
-log4j.rootLogger=INFO, out, osgi:*
-log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-log4j.appender.out.file=${karaf.data}/log/karaf.log
-log4j.appender.out.append=true
-log4j.appender.out.maxFileSize=1MB
-log4j.appender.out.maxBackupIndex=10
-
-# Sift appender
-log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
-log4j.appender.sift.key=bundle.name
-log4j.appender.sift.default=karaf
-log4j.appender.sift.appender=org.apache.log4j.FileAppender
-log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %m%n
-log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
-log4j.appender.sift.appender.append=true
-
-log4j.logger.org.apache.cxf=WARN
-log4j.logger.org.apache.cxf.interceptor.security=ERROR
+log4j2.rootLogger.level = INFO
+# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
+#log4j2.rootLogger.type = asyncRoot
+#log4j2.rootLogger.includeLocation = false
+log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
+log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
+log4j2.rootLogger.appenderRef.Console.ref = Console
+log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
+
+# Loggers configuration
+
+# SSHD logger
+log4j2.logger.sshd.name = org.apache.sshd
+log4j2.logger.sshd.level = INFO
+
+# Spifly logger
+log4j2.logger.spifly.name = org.apache.aries.spifly
+log4j2.logger.spifly.level = WARN
+
+# Security audit logger
+log4j2.logger.audit.name = org.apache.karaf.jaas.modules.audit
+log4j2.logger.audit.level = INFO
+log4j2.logger.audit.additivity = false
+log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
+
+# Appenders configuration
+
+# Console appender not used by default (see log4j2.rootLogger.appenderRefs)
+log4j2.appender.console.type = Console
+log4j2.appender.console.name = Console
+log4j2.appender.console.layout.type = PatternLayout
+log4j2.appender.console.layout.pattern = ${log4j2.pattern}
+
+# Rolling file appender
+log4j2.appender.rolling.type = RollingRandomAccessFile
+log4j2.appender.rolling.name = RollingFile
+log4j2.appender.rolling.fileName = ${karaf.data}/log/karaf.log
+log4j2.appender.rolling.filePattern = ${karaf.data}/log/karaf.log.%i
+# uncomment to not force a disk flush
+#log4j2.appender.rolling.immediateFlush = false
+log4j2.appender.rolling.append = true
+log4j2.appender.rolling.layout.type = PatternLayout
+log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
+log4j2.appender.rolling.policies.type = Policies
+log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+log4j2.appender.rolling.policies.size.size = 16MB
+
+# Audit file appender
+log4j2.appender.audit.type = RollingRandomAccessFile
+log4j2.appender.audit.name = AuditRollingFile
+log4j2.appender.audit.fileName = ${karaf.data}/security/audit.log
+log4j2.appender.audit.filePattern = ${karaf.data}/security/audit.log.%i
+log4j2.appender.audit.append = true
+log4j2.appender.audit.layout.type = PatternLayout
+log4j2.appender.audit.layout.pattern = ${log4j2.pattern}
+log4j2.appender.audit.policies.type = Policies
+log4j2.appender.audit.policies.size.type = SizeBasedTriggeringPolicy
+log4j2.appender.audit.policies.size.size = 8MB
+
+# OSGi appender
+log4j2.appender.osgi.type = PaxOsgi
+log4j2.appender.osgi.name = PaxOsgi
+log4j2.appender.osgi.filter = *
+
+# help with identification of maven-related problems with pax-url-aether
+#log4j2.logger.aether.name = shaded.org.eclipse.aether
+#log4j2.logger.aether.level = TRACE
+#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
+#log4j2.logger.http-headers.level = DEBUG
+#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
+#log4j2.logger.maven.level = TRACE
+
+log4j2.logger.cxfInterceptor.name = org.apache.cxf.interceptor
+log4j2.logger.cxfInterceptor.level = WARN
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/package/src/main/resources/etc/startup.properties
----------------------------------------------------------------------
diff --git a/package/src/main/resources/etc/startup.properties b/package/src/main/resources/etc/startup.properties
deleted file mode 100644
index e575eb4..0000000
--- a/package/src/main/resources/etc/startup.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-# This files was patched manually to patch org.apache.aries.blueprint.core to version 1.6.2
-# to solve a problem with offline startup (UNOMI-75)
-
-#Bundles to be started on startup, with startlevel
-
-# feature: framework version: 3.0.8
-mvn\:org.ops4j.pax.url/pax-url-aether/2.4.7 = 5
-mvn\:org.ops4j.pax.url/pax-url-wrap/2.4.7/jar/uber = 5
-mvn\:org.ops4j.pax.logging/pax-logging-api/1.8.4 = 8
-mvn\:org.ops4j.pax.logging/pax-logging-service/1.8.4 = 8
-mvn\:org.apache.karaf.service/org.apache.karaf.service.guard/3.0.8 = 10
-mvn\:org.apache.felix/org.apache.felix.configadmin/1.8.4 = 10
-mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.2 = 11
-mvn\:org.ow2.asm/asm-all/5.0.3 = 12
-mvn\:org.apache.aries/org.apache.aries.util/1.1.1 = 20
-mvn\:org.apache.aries.proxy/org.apache.aries.proxy.api/1.0.1 = 20
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.0.8 = 20
-mvn\:org.apache.aries.proxy/org.apache.aries.proxy.impl/1.0.4 = 20
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.api/1.0.1 = 20
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 20
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.6.2 = 20
-mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/3.0.8 = 24
-mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/3.0.8 = 24
-mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/3.0.8 = 24
-mvn\:org.apache.karaf.region/org.apache.karaf.region.core/3.0.8 = 25
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/3.0.8 = 25
-mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.features/3.0.8 = 26
-mvn\:jline/jline/2.13 = 30
-mvn\:org.jledit/core/0.2.1 = 30
-mvn\:org.apache.karaf.features/org.apache.karaf.features.command/3.0.8 = 30
-mvn\:org.apache.karaf.bundle/org.apache.karaf.bundle.core/3.0.8 = 30
-mvn\:org.apache.karaf.bundle/org.apache.karaf.bundle.command/3.0.8 = 30
-mvn\:org.apache.karaf.shell/org.apache.karaf.shell.console/3.0.8 = 30
-mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/3.0.8 = 30
-mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.config/3.0.8 = 30
-mvn\:org.apache.sshd/sshd-core/0.14.0 = 30
-mvn\:org.apache.karaf.shell/org.apache.karaf.shell.help/3.0.8 = 30
-mvn\:org.apache.karaf.shell/org.apache.karaf.shell.table/3.0.8 = 30
-mvn\:org.apache.karaf.system/org.apache.karaf.system.core/3.0.8 = 30
-mvn\:org.apache.karaf.system/org.apache.karaf.system.command/3.0.8 = 30
-mvn\:org.apache.karaf.shell/org.apache.karaf.shell.commands/3.0.8 = 30
-mvn\:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0 = 30
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
----------------------------------------------------------------------
diff --git a/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java b/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
index d37ff5f..f260109 100644
--- a/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
+++ b/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java
@@ -82,7 +82,7 @@ public class BasicTest {
MavenArtifactUrlReference karafUrl = maven()
.groupId("org.apache.karaf")
.artifactId("apache-karaf")
- .version("4.1.1")
+ .version("4.1.5")
.type("tar.gz");
MavenUrlReference karafStandardRepo = maven()
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 2838aaa..2cf78ab 100644
--- a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -183,7 +183,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="updateProperties"/>
</service-properties>
@@ -193,7 +193,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="modifyConsent"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 1bc3402..f8eb0e6 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -82,14 +82,14 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.0.1</version>
+ <artifactId>httpclient-osgi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.0.1</version>
+ <artifactId>httpcore-osgi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7a39ca3f/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 839ad18..7411399 100644
--- a/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -61,7 +61,7 @@
</service-properties>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="setRemoteHostInfo"/>
</service-properties>