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 2016/11/14 16:25:23 UTC
[01/38] incubator-unomi git commit: UNOMI-32 fix issue with missing
save after event execution.
Repository: incubator-unomi
Updated Branches:
refs/heads/UNOMI-28-ES-2-X-UPGRADE e07082374 -> 285d4cc6d
UNOMI-32 fix issue with missing save after event execution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f47e8466
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f47e8466
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f47e8466
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: f47e846660cb7c785ee4bff39809848266678230
Parents: f40318a
Author: dgaillard <dg...@jahia.com>
Authored: Wed Sep 7 10:59:59 2016 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Wed Sep 7 10:59:59 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/unomi/api/services/ProfileService.java | 2 +-
.../java/org/apache/unomi/rest/ProfileServiceEndPoint.java | 8 ++++++--
.../apache/unomi/services/services/ProfileServiceImpl.java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f47e8466/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/services/ProfileService.java b/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
index a998e5e..3422054 100644
--- a/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
@@ -111,7 +111,7 @@ public interface ProfileService {
* @param profile the profile to be saved
* @return the newly saved profile
*/
- boolean saveOrmerge(Profile profile);
+ boolean saveOrMerge(Profile profile);
/**
* Removes the profile (or persona if the {@code persona} parameter is set to {@code true}) identified by the specified identifier.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f47e8466/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java b/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
index 038178d..ace49c0 100644
--- a/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
@@ -193,10 +193,14 @@ public class ProfileServiceEndPoint {
@POST
@Path("/")
public Profile save(Profile profile) {
- if (profileService.saveOrmerge(profile)) {
+ if (profileService.saveOrMerge(profile)) {
+ profile = profileService.load(profile.getItemId());
Event profileUpdated = new Event("profileUpdated", null, profile, null, null, profile, new Date());
profileUpdated.setPersistent(false);
- eventService.send(profileUpdated);
+ int changes = eventService.send(profileUpdated);
+ if ((changes & EventService.PROFILE_UPDATED) == EventService.PROFILE_UPDATED) {
+ profileService.save(profile);
+ }
}
return profile;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f47e8466/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 4e680fc..eaf8d98 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
@@ -400,7 +400,7 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
return persistenceService.load(profile.getItemId(), Profile.class);
}
- public boolean saveOrmerge(Profile profile) {
+ public boolean saveOrMerge(Profile profile) {
Profile previousProfile = persistenceService.load(profile.getItemId(), Profile.class);
if (previousProfile == null) {
return persistenceService.save(profile);
[30/38] incubator-unomi git commit: UNOMI-59 : Handle update of
multivalued property
Posted by sh...@apache.org.
UNOMI-59 : Handle update of multivalued property
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b311e198
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b311e198
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b311e198
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: b311e19886ceb0277c45c48319b94256d60ed3eb
Parents: b8cf1c6
Author: Abdelkader Midani <am...@jahia.com>
Authored: Tue Oct 11 18:27:34 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Mon Oct 24 16:19:29 2016 +0200
----------------------------------------------------------------------
.../unomi/services/services/ProfileServiceImpl.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b311e198/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 9194d16..52aef50 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
@@ -771,16 +771,8 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
for (Map.Entry<String, Object> newEntry : object.entrySet()) {
if (newEntry.getValue() != null) {
if (newEntry.getValue() instanceof Collection) {
- Collection currentCollection = (Collection) target.get(newEntry.getKey());
- if (currentCollection != null) {
- if (!currentCollection.containsAll((Collection) newEntry.getValue())) {
- currentCollection.clear();
- changed |= currentCollection.addAll((Collection) newEntry.getValue());
- }
- } else {
- target.put(newEntry.getKey(), newEntry.getValue());
- changed = true;
- }
+ target.put(newEntry.getKey(), newEntry.getValue());
+ changed = true;
} else if (newEntry.getValue() instanceof Map) {
Map<String,Object> currentMap = (Map) target.get(newEntry.getKey());
if (currentMap == null) {
[28/38] incubator-unomi git commit: UNOMI-59 : Handle update of
multivalued property - form mapping
Posted by sh...@apache.org.
UNOMI-59 : Handle update of multivalued property - form mapping
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/20e83a13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/20e83a13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/20e83a13
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 20e83a1355c209cc38f44dead240d9789966b15a
Parents: b311e19
Author: Abdelkader Midani <am...@jahia.com>
Authored: Wed Oct 19 16:35:28 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Mon Oct 24 16:19:29 2016 +0200
----------------------------------------------------------------------
.../unomi/plugins/baseplugin/actions/SetPropertyAction.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/20e83a13/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
index a731468..54ce89c 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
@@ -41,6 +41,9 @@ public class SetPropertyAction implements ActionExecutor {
String propertyName = (String) action.getParameterValues().get("setPropertyName");
Object propertyValue = action.getParameterValues().get("setPropertyValue");
+ if(propertyValue == null) {
+ propertyValue = action.getParameterValues().get("setPropertyValueMultiple");
+ }
Object propertyValueInteger = action.getParameterValues().get("setPropertyValueInteger");
if(propertyValueInteger != null && propertyValue == null) {
[19/38] incubator-unomi git commit: UNOMI-58 : fixed binary build
generation
Posted by sh...@apache.org.
UNOMI-58 : fixed binary build generation
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9dff31f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9dff31f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9dff31f7
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 9dff31f772ed919e9f8799c4c34b1891fd1fcfeb
Parents: 13cd101
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 15:40:47 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 15:40:47 2016 +0200
----------------------------------------------------------------------
package/pom.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9dff31f7/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index aea8712..d046a6a 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -171,7 +171,7 @@
<version>${elasticsearch.version}</version>
<type>tar.gz</type>
<includes>**/lib/sigar/**</includes>
- <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+ <outputDirectory>${project.build.directory}/unpack</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -257,10 +257,9 @@
</goals>
<configuration>
<target>
- <move todir="${project.build.directory}/assembly/lib/sigar">
- <fileset dir="${project.build.directory}/assembly/elasticsearch-${elasticsearch.version}/lib/sigar" />
- </move>
- <delete dir="${project.build.directory}/assembly/elasticsearch-${elasticsearch.version}" />
+ <copy todir="${project.build.directory}/assembly/lib/sigar">
+ <fileset dir="${project.build.directory}/unpack/elasticsearch-${elasticsearch.version}/lib/sigar" />
+ </copy>
</target>
</configuration>
</execution>
[24/38] incubator-unomi git commit: [maven-release-plugin] prepare
for next development iteration
Posted by sh...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/6ac0bff2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/6ac0bff2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/6ac0bff2
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 6ac0bff2f531777796e87ff2da58a49b4f8e493d
Parents: 619e51f
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 17:20:16 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 17:20:16 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 4abc419..0f06620 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 787b23d..f601a7c 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 2612b1e..6798bfe 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index f8cc06a..e1e7310 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 07f199b..d348ad9 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 0157100..7a1f6b6 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 822d736..d7ebedb 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 8e384b5..aa9cb48 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 391dbb9..46e4315 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index b30aa30..d6800cf 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 0a8c31f..d13fe92 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e20fec3..e0426ce 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 17df5d0..7d6c400 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 695813c..b3f7448 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 166b67d..72c7abd 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 39a139b..891da68 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 4a5e45d..9e361c0 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 6787395..b029a8c 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 94c5328..99ef177 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 37e1a98..68d5ba7 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 885c629..078cfb8 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index 3327b92..979aa35 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 5d04ffb..2bdcdd3 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 202e097..f034ed2 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9726f35..7f63535 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a3c6316..35d1fbd 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 0fd8b3b..1764ed1 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 0151922..bb47811 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index acee602..2f4ceb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>unomi-root-1.1.0-incubating</tag>
+ <tag>HEAD</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index c8187c1..bba4a5a 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 9aaf2fd..8941427 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index 676df5a..c1725d5 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index bd1394f..abd3cc1 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6ac0bff2/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 4ee5c2b..5af699f 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[10/38] incubator-unomi git commit: Disable binary generation when
src profile is enabled
Posted by sh...@apache.org.
Disable binary generation when src profile is enabled
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/76293f36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/76293f36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/76293f36
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 76293f3667d9002f0976410f56d1033a3306e707
Parents: 84b5445
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 18:32:36 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 18:32:36 2016 +0200
----------------------------------------------------------------------
package/pom.xml | 317 ++++++++++++++++++++++++++-------------------------
1 file changed, 162 insertions(+), 155 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/76293f36/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index eb6546b..aea8712 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -117,167 +117,12 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-sigar</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elasticsearch.version}</version>
- <type>tar.gz</type>
- <includes>**/lib/sigar/**</includes>
- <outputDirectory>${project.build.directory}/assembly</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-persistence-elasticsearch-core</artifactId>
- <version>${project.version}</version>
- <classifier>elasticsearchconfig</classifier>
- <type>yml</type>
- <outputDirectory>
- ${project.build.directory}/assembly/etc
- </outputDirectory>
- <destFileName>elasticsearch.yml</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>
- </artifactItems>
- <!-- other configurations here -->
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-karaf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <move todir="${project.build.directory}/assembly/lib/sigar">
- <fileset dir="${project.build.directory}/assembly/elasticsearch-${elasticsearch.version}/lib/sigar" />
- </move>
- <delete dir="${project.build.directory}/assembly/elasticsearch-${elasticsearch.version}" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-kar</id>
- <phase>compile</phase>
- <goals>
- <goal>install-kars</goal>
- </goals>
- </execution>
- <execution>
- <id>package</id>
- <goals>
- <goal>instance-create-archive</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <installedFeatures>
- <feature>wrapper</feature>
- </installedFeatures>
- <bootFeatures>
- <feature>standard</feature>
- <feature>management</feature>
- <feature>ssh</feature>
- <feature>config</feature>
- <feature>region</feature>
- <feature>package</feature>
- <feature>kar</feature>
- <feature>war</feature>
- <feature>cxf</feature>
- <feature>openwebbeans</feature>
- <feature>pax-cdi-web-openwebbeans</feature>
- <feature>unomi-kar</feature>
- </bootFeatures>
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
<profile>
<id>src</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<build>
<plugins>
<plugin>
@@ -301,6 +146,168 @@
</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-sigar</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>${elasticsearch.version}</version>
+ <type>tar.gz</type>
+ <includes>**/lib/sigar/**</includes>
+ <outputDirectory>${project.build.directory}/assembly</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-persistence-elasticsearch-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>elasticsearchconfig</classifier>
+ <type>yml</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>elasticsearch.yml</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>
+ </artifactItems>
+ <!-- other configurations here -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-karaf</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <move todir="${project.build.directory}/assembly/lib/sigar">
+ <fileset dir="${project.build.directory}/assembly/elasticsearch-${elasticsearch.version}/lib/sigar" />
+ </move>
+ <delete dir="${project.build.directory}/assembly/elasticsearch-${elasticsearch.version}" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-kar</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>install-kars</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package</id>
+ <goals>
+ <goal>instance-create-archive</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <installedFeatures>
+ <feature>wrapper</feature>
+ </installedFeatures>
+ <bootFeatures>
+ <feature>standard</feature>
+ <feature>management</feature>
+ <feature>ssh</feature>
+ <feature>config</feature>
+ <feature>region</feature>
+ <feature>package</feature>
+ <feature>kar</feature>
+ <feature>war</feature>
+ <feature>cxf</feature>
+ <feature>openwebbeans</feature>
+ <feature>pax-cdi-web-openwebbeans</feature>
+ <feature>unomi-kar</feature>
+ </bootFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[12/38] incubator-unomi git commit: [maven-release-plugin] rollback
the release of unomi-root-1.1.0-incubating
Posted by sh...@apache.org.
[maven-release-plugin] rollback the release of unomi-root-1.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/623ccd8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/623ccd8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/623ccd8e
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 623ccd8ea0b7ff0d582d926f08762b38fa2079f6
Parents: 33e4d52
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 18:37:22 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 18:37:22 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 4abc419..aae2df9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 787b23d..31dcfae 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 2612b1e..4a35441 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index f8cc06a..8a43483 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 07f199b..d76cd02 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 0157100..90da5da 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 822d736..1a3765c 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 8e384b5..4591680 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 391dbb9..28e653c 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index b30aa30..a3ae494 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 0a8c31f..b6c8d3c 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e20fec3..b156a45 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 17df5d0..1fd7b0f 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index c8d01d2..aea8712 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 166b67d..2b51dec 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 39a139b..eddadf1 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 4a5e45d..8f576db 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 6787395..3158c80 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 94c5328..cf7a403 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 37e1a98..0b14515 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 885c629..61e4a76 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index 3327b92..b866626 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 5d04ffb..7bb2eca 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 202e097..573ff55 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9726f35..9cffe34 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a3c6316..3587d92 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index b20df31..043b430 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 0151922..938f9ca 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8796804..77224da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>unomi-root-1.1.0-incubating</tag>
+ <tag>HEAD</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index c8187c1..52f879a 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 9aaf2fd..d1278b4 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index 676df5a..b3834d8 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index bd1394f..51f5999 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/623ccd8e/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 4ee5c2b..2eee85c 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[35/38] incubator-unomi git commit: Merge PR #14
Posted by sh...@apache.org.
Merge PR #14
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/7382af5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/7382af5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/7382af5a
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 7382af5ad2371f966959ea47f8ae77c2f206f0e6
Parents: 940ca9d 36bc5d2
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Oct 27 09:55:32 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Oct 27 09:55:32 2016 +0200
----------------------------------------------------------------------
.../plugins/baseplugin/actions/SetPropertyAction.java | 11 ++++++++---
.../META-INF/cxs/actions/setPropertyAction.json | 5 +++++
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7382af5a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
----------------------------------------------------------------------
diff --cc plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
index 54ce89c,25c4b0e..f50de42
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
@@@ -41,15 -41,17 +41,20 @@@ public class SetPropertyAction implemen
String propertyName = (String) action.getParameterValues().get("setPropertyName");
Object propertyValue = action.getParameterValues().get("setPropertyValue");
+ if(propertyValue == null) {
+ propertyValue = action.getParameterValues().get("setPropertyValueMultiple");
+ }
Object propertyValueInteger = action.getParameterValues().get("setPropertyValueInteger");
+ Object setPropertyValueMultiple = action.getParameterValues().get("setPropertyValueMultiple");
- if(propertyValueInteger != null && propertyValue == null) {
- propertyValue = PropertyHelper.getInteger(propertyValueInteger);
+ if (propertyValue == null) {
+ if (propertyValueInteger != null) {
+ propertyValue = PropertyHelper.getInteger(propertyValueInteger);
+ }
+ if(setPropertyValueMultiple != null) {
+ propertyValue = setPropertyValueMultiple;
+ }
}
-
if (propertyValue != null && propertyValue.equals("now")) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
format.setTimeZone(TimeZone.getTimeZone("UTC"));
[21/38] incubator-unomi git commit: UNOMI-57 : removed unnecessary
reference to mit license
Posted by sh...@apache.org.
UNOMI-57 : removed unnecessary reference to mit license
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/0309ee5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0309ee5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0309ee5b
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 0309ee5b7201e07c4716a4740824b58b2cf7ffde
Parents: 9ab88f5
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 16:51:09 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 16:51:09 2016 +0200
----------------------------------------------------------------------
NOTICE | 1 -
package/src/main/resources/NOTICE | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0309ee5b/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 31a0415..d457b8e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,4 +10,3 @@ Jahia Solutions Software (http://www.jahia.com/).
This product includes software developed by
Edin Dazdarevic (edin.dazdarevic@gmail.com).
Copyright (c) 2013 Edin Dazdarevic (edin.dazdarevic@gmail.com)
-Licensed under the MIT License.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0309ee5b/package/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/package/src/main/resources/NOTICE b/package/src/main/resources/NOTICE
index f836bc4..b973722 100644
--- a/package/src/main/resources/NOTICE
+++ b/package/src/main/resources/NOTICE
@@ -10,7 +10,6 @@ Jahia Solutions Software (http://www.jahia.com/).
This product includes software developed by
Edin Dazdarevic (edin.dazdarevic@gmail.com).
Copyright (c) 2013 Edin Dazdarevic (edin.dazdarevic@gmail.com)
-Licensed under the MIT License.
Notice for Elasticsearch
---------------------------------------------------------------------------------------------------
[06/38] incubator-unomi git commit: [maven-release-plugin] prepare
release unomi-root-1.1.0-incubating
Posted by sh...@apache.org.
[maven-release-plugin] prepare release unomi-root-1.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f07b8720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f07b8720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f07b8720
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: f07b8720fc3885b755d51590db93e69e4c16a55d
Parents: 88ac0ec
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 16:29:15 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 16:29:15 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 ++--
extensions/geonames/services/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 ++--
itests/pom.xml | 8 ++--
kar/pom.xml | 30 +++++++-------
package/pom.xml | 4 +-
performance-tests/pom.xml | 4 +-
persistence-elasticsearch/core/pom.xml | 6 +--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 42 ++++++++++----------
rest/pom.xml | 6 +--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +-
services/pom.xml | 6 +--
wab/pom.xml | 6 +--
34 files changed, 111 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index aae2df9..4abc419 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 31dcfae..787b23d 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 4a35441..2612b1e 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index 8a43483..f8cc06a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index d76cd02..07f199b 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 90da5da..0157100 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 1a3765c..822d736 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 4591680..8e384b5 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 28e653c..391dbb9 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index a3ae494..b30aa30 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index b6c8d3c..0a8c31f 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index b156a45..e20fec3 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 1fd7b0f..17df5d0 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index eb6546b..be2752c 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 2b51dec..166b67d 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index eddadf1..39a139b 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 8f576db..4a5e45d 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 3158c80..6787395 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index cf7a403..94c5328 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 0b14515..37e1a98 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 61e4a76..885c629 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index b866626..3327b92 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 7bb2eca..5d04ffb 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 573ff55..202e097 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9cffe34..9726f35 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3587d92..a3c6316 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 043b430..b20df31 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 938f9ca..0151922 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db4e1dd..8796804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<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">
+<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>
@@ -24,7 +23,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>15</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.unomi</groupId>
@@ -35,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
<licenses>
@@ -100,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>unomi-root-1.1.0-incubating</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
@@ -291,33 +290,32 @@
<checkstyleRules>
<module name="Checker">
<module name="TreeWalker">
- <module name="JavadocType"/>
+ <module name="JavadocType" />
<module name="JavadocMethod">
- <property name="scope" value="public"/>
- <property name="allowMissingPropertyJavadoc" value="true"/>
+ <property name="scope" value="public" />
+ <property name="allowMissingPropertyJavadoc" value="true" />
</module>
- <module name="UnusedImports"/>
+ <module name="UnusedImports" />
<module name="ConstantName">
- <property name="applyToProtected" value="false"/>
- <property name="applyToPackage" value="false"/>
- <property name="applyToPrivate" value="false"/>
+ <property name="applyToProtected" value="false" />
+ <property name="applyToPackage" value="false" />
+ <property name="applyToPrivate" value="false" />
</module>
<module name="EmptyBlock">
- <property name="option" value="text"/>
+ <property name="option" value="text" />
</module>
- <module name="NeedBraces"/>
- <module name="EqualsHashCode"/>
+ <module name="NeedBraces" />
+ <module name="EqualsHashCode" />
<module name="MagicNumber">
- <property name="ignoreNumbers"
- value=" -1, 0, 1, 2, 3, 17, 24, 31, 37, 60, 255, 256, 1000"/>
+ <property name="ignoreNumbers" value=" -1, 0, 1, 2, 3, 17, 24, 31, 37, 60, 255, 256, 1000" />
</module>
- <module name="SimplifyBooleanReturn"/>
+ <module name="SimplifyBooleanReturn" />
<module name="IllegalCatch">
- <property name="illegalClassNames" value=" java.lang.Throwable"/>
+ <property name="illegalClassNames" value=" java.lang.Throwable" />
</module>
- <module name="MultipleVariableDeclarations"/>
- <module name="OneStatementPerLine"/>
- <module name="RedundantModifier"/>
+ <module name="MultipleVariableDeclarations" />
+ <module name="OneStatementPerLine" />
+ <module name="RedundantModifier" />
</module>
</module>
</checkstyleRules>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 52f879a..c8187c1 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index d1278b4..9aaf2fd 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index b3834d8..676df5a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 51f5999..bd1394f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f07b8720/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 2eee85c..4ee5c2b 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
[37/38] incubator-unomi git commit: Merge branch 'master' into
UNOMI-28-ES-2-X-UPGRADE
Posted by sh...@apache.org.
Merge branch 'master' into UNOMI-28-ES-2-X-UPGRADE
# Conflicts:
# package/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f0bd45f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f0bd45f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f0bd45f5
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: f0bd45f522a56b8c36a7ac1e0174f689fca3b42b
Parents: e070823 ea1254f
Author: Serge Huber <sh...@apache.org>
Authored: Fri Nov 11 16:00:11 2016 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Fri Nov 11 16:00:11 2016 +0100
----------------------------------------------------------------------
KEYS | 58 ++
NOTICE | 1 -
api/pom.xml | 2 +-
.../unomi/api/services/ProfileService.java | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +-
extensions/geonames/services/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 | 13 +-
.../privacy/internal/PrivacyServiceImpl.java | 8 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 1 +
itests/pom.xml | 8 +-
kar/pom.xml | 30 +-
package/pom.xml | 314 ++++-----
package/src/main/resources/LICENSE | 550 ++++++---------
package/src/main/resources/NOTICE | 669 +------------------
performance-tests/pom.xml | 4 +-
persistence-elasticsearch/core/pom.xml | 6 +-
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
persistence-elasticsearch/pom.xml | 2 +-
persistence-spi/pom.xml | 4 +-
plugins/baseplugin/pom.xml | 6 +-
.../baseplugin/actions/SetPropertyAction.java | 14 +-
.../META-INF/cxs/actions/setPropertyAction.json | 5 +
.../cxs/conditions/goalMatchCondition.json | 3 +-
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 | 6 +-
plugins/tracked-event/pom.xml | 6 +-
pom.xml | 47 +-
rest/pom.xml | 8 +-
.../unomi/rest/ProfileServiceEndPoint.java | 8 +-
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +-
services/pom.xml | 6 +-
.../services/services/ProfileServiceImpl.java | 45 +-
src/site/markdown/download.md | 10 +-
wab/pom.xml | 6 +-
47 files changed, 607 insertions(+), 1317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/itests/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/package/pom.xml
----------------------------------------------------------------------
diff --cc package/pom.xml
index c55aed0,b3f7448..5de850b
--- a/package/pom.xml
+++ b/package/pom.xml
@@@ -299,6 -146,167 +149,166 @@@
</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-sigar</id>
++ <id>unpack-deploy-by-query-plugin</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
++ <groupId>org.elasticsearch.plugin</groupId>
++ <artifactId>delete-by-query</artifactId>
++ <version>${elasticsearch.version}</version>
++ <type>zip</type>
++ <outputDirectory>${project.build.directory}/assembly/elasticsearch/plugins/delete-by-query</outputDirectory>
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.elasticsearch.module</groupId>
++ <artifactId>lang-groovy</artifactId>
++ <version>${elasticsearch.version}</version>
++ <type>zip</type>
++ <outputDirectory>${project.build.directory}/assembly/elasticsearch/modules/lang-groovy</outputDirectory>
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.elasticsearch.module</groupId>
++ <artifactId>lang-expression</artifactId>
+ <version>${elasticsearch.version}</version>
- <type>tar.gz</type>
- <includes>**/lib/sigar/**</includes>
- <outputDirectory>${project.build.directory}/unpack</outputDirectory>
++ <type>zip</type>
++ <outputDirectory>${project.build.directory}/assembly/elasticsearch/modules/lang-expression</outputDirectory>
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.elasticsearch.module</groupId>
++ <artifactId>reindex</artifactId>
++ <version>${elasticsearch.version}</version>
++ <type>zip</type>
++ <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-persistence-elasticsearch-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>elasticsearchconfig</classifier>
+ <type>yml</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>elasticsearch.yml</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>
+ </artifactItems>
+ <!-- other configurations here -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-karaf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <copy todir="${project.build.directory}/assembly/lib/sigar">
- <fileset dir="${project.build.directory}/unpack/elasticsearch-${elasticsearch.version}/lib/sigar" />
- </copy>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-kar</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>install-kars</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package</id>
+ <goals>
+ <goal>instance-create-archive</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <installedFeatures>
+ <feature>wrapper</feature>
+ </installedFeatures>
+ <bootFeatures>
+ <feature>standard</feature>
+ <feature>management</feature>
+ <feature>ssh</feature>
+ <feature>config</feature>
+ <feature>region</feature>
+ <feature>package</feature>
+ <feature>kar</feature>
+ <feature>war</feature>
+ <feature>cxf</feature>
+ <feature>openwebbeans</feature>
+ <feature>pax-cdi-web-openwebbeans</feature>
+ <feature>unomi-kar</feature>
+ </bootFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- </profile>
</profiles>
++
</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f0bd45f5/pom.xml
----------------------------------------------------------------------
[16/38] incubator-unomi git commit: UNOMI-57 : Updated uadetector
version to remove lgpl reference
Posted by sh...@apache.org.
UNOMI-57 : Updated uadetector version to remove lgpl reference
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/71691394
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/71691394
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/71691394
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 716913943bbb5328b9e207d1ab9c569bfb819152
Parents: 3ed69fa
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 15:05:39 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 15:05:39 2016 +0200
----------------------------------------------------------------------
package/src/main/resources/LICENSE | 410 ++++++++++++++++----------------
package/src/main/resources/NOTICE | 9 +-
plugins/request/pom.xml | 4 +-
3 files changed, 210 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/71691394/package/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/package/src/main/resources/LICENSE b/package/src/main/resources/LICENSE
index 2424168..3b07826 100644
--- a/package/src/main/resources/LICENSE
+++ b/package/src/main/resources/LICENSE
@@ -1,3 +1,208 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
This copy of Jackson JSON processor annotations is licensed under the
Apache (Software) License, version 2.0 ("the License").
See the License for details about distribution rights, and the
@@ -300,211 +505,6 @@ the location should be "release-notes/asl"; and in jar "META-INF/"
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
xml-commons/java/external/LICENSE.dom-software.txt $Id: LICENSE.dom-software.txt 734314 2009-01-14 03:33:27Z mrglavas $
This license came from: http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip (COPYRIGHT.html)
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/71691394/package/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/package/src/main/resources/NOTICE b/package/src/main/resources/NOTICE
index 3061d8c..f836bc4 100644
--- a/package/src/main/resources/NOTICE
+++ b/package/src/main/resources/NOTICE
@@ -890,13 +890,10 @@ the same directory as this file, for the license terms of the components that
this product depends on.
-------------------------------------------------------------------------------
-This product contains a modified version of Dave Koelle's Alphanum Algorithm,
-which can be obtained at:
+This product uses a version of Olivier Oudot's compareNatural code, licensed
+under CC BY-SA 3.0:
- * LICENSE:
- * LICENSE.alphanum.txt (GNU LGPL 2.1 or above)
- * HOMEPAGE:
- * http://www.davekoelle.com/alphanum.html
+ * https://creativecommons.org/licenses/by-sa/3.0/
This product uses a version of Jaroslav Mallat's UAS Data, which can be
obtained at:
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/71691394/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 908ec7c..1764ed1 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -44,13 +44,13 @@
<dependency>
<groupId>net.sf.uadetector</groupId>
<artifactId>uadetector-resources</artifactId>
- <version>2014.07</version>
+ <version>2014.10</version>
</dependency>
<dependency>
<groupId>net.sf.uadetector</groupId>
<artifactId>uadetector-core</artifactId>
- <version>0.9.19</version>
+ <version>0.9.22-133</version>
</dependency>
<dependency>
[38/38] incubator-unomi git commit: UNOMI-63 Use ElasticSearch
BulkProcessing to perform segment updates - Fix merge issues with master -
Implement bulk processor support for ElasticSearch update operations
(indexing operations not yet integrated because
Posted by sh...@apache.org.
UNOMI-63 Use ElasticSearch BulkProcessing to perform segment updates
- Fix merge issues with master
- Implement bulk processor support for ElasticSearch update operations (indexing operations not yet integrated because of IndexNotFoundException handling)
- Minor logging improvements in SegmentService
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/285d4cc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/285d4cc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/285d4cc6
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 285d4cc6dbcce938f094188fa3809f93fb9dc52b
Parents: f0bd45f
Author: Serge Huber <sh...@apache.org>
Authored: Mon Nov 14 17:25:05 2016 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Mon Nov 14 17:25:05 2016 +0100
----------------------------------------------------------------------
package/pom.xml | 5 +-
.../ElasticSearchPersistenceServiceImpl.java | 133 +++++++++++++++++--
.../services/services/SegmentServiceImpl.java | 8 +-
3 files changed, 130 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/285d4cc6/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 5de850b..d83f4c3 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -123,9 +123,6 @@
<profiles>
<profile>
<id>src</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<build>
<plugins>
<plugin>
@@ -308,7 +305,7 @@
</plugin>
</plugins>
</build>
+ </profile>
</profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/285d4cc6/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index 16f1bc6..d13f7b6 100644
--- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -40,8 +40,7 @@ import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.action.bulk.*;
import org.elasticsearch.action.deletebyquery.DeleteByQueryAction;
import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder;
import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse;
@@ -51,12 +50,15 @@ import org.elasticsearch.action.percolate.PercolateResponse;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsException;
+import org.elasticsearch.common.unit.ByteSizeUnit;
+import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.IndexNotFoundException;
@@ -101,6 +103,7 @@ import java.nio.file.Paths;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
@@ -114,6 +117,12 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
public static final String CONTEXTSERVER_PORT = "contextserver.port";
public static final String CONTEXTSERVER_SECURE_ADDRESS = "contextserver.secureAddress";
public static final String CONTEXTSERVER_SECURE_PORT = "contextserver.securePort";
+ public static final String CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_NAME = "contextserver.elasticsearch.bulkprocessor.name";
+ public static final String CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_CONCURRENTREQUEST = "contextserver.elasticsearch.bulkprocessor.concurrentRequests";
+ public static final String CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BULKACTIONS = "contextserver.elasticsearch.bulkprocessor.bulkActions";
+ public static final String CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BULKSIZE = "contextserver.elasticsearch.bulkprocessor.bulkSize";
+ public static final String CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_FLUSHINTERVAL = "contextserver.elasticsearch.bulkprocessor.flushInterval";
+ public static final String CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BACKOFFPOLICY = "contextserver.elasticsearch.bulkprocessor.backoffPolicy";
public static final String KARAF_HOME = "karaf.home";
public static final String ELASTICSEARCH_HOME_DIRECTORY = "elasticsearch";
public static final String ELASTICSEARCH_PLUGINS_DIRECTORY = ELASTICSEARCH_HOME_DIRECTORY + "/plugins";
@@ -136,6 +145,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
private Node node;
private Client client;
+ private BulkProcessor bulkProcessor;
private String clusterName;
private String indexName;
private String monthlyIndexNumberOfShards;
@@ -351,6 +361,10 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
getMonthlyIndex(new Date(), true);
+ if (client != null && bulkProcessor == null) {
+ bulkProcessor = getBulkProcessor();
+ }
+
return null;
}
}.executeInClassLoader();
@@ -388,11 +402,104 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
logger.info(this.getClass().getName() + " service started successfully.");
}
+ public BulkProcessor getBulkProcessor() {
+ if (bulkProcessor != null) {
+ return bulkProcessor;
+ }
+ BulkProcessor.Builder bulkProcessorBuilder = BulkProcessor.builder(
+ client,
+ new BulkProcessor.Listener() {
+ @Override
+ public void beforeBulk(long executionId,
+ BulkRequest request) {
+ logger.debug("Before Bulk");
+ }
+
+ @Override
+ public void afterBulk(long executionId,
+ BulkRequest request,
+ BulkResponse response) {
+ logger.debug("After Bulk");
+ }
+
+ @Override
+ public void afterBulk(long executionId,
+ BulkRequest request,
+ Throwable failure) {
+ logger.error("After Bulk (failure)", failure);
+ // we could add index creation here in the case of index seperation by dates.
+ }
+ });
+ if (System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_NAME) != null) {
+ String name = System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_NAME);
+ if (name != null && name.length() > 0) {
+ bulkProcessorBuilder.setName(name);
+ }
+ }
+ if (System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_CONCURRENTREQUEST) != null) {
+ String concurrentRequestsStr = System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_CONCURRENTREQUEST);
+ int concurrentRequests = Integer.parseInt(concurrentRequestsStr);
+ if (concurrentRequests > 1) {
+ bulkProcessorBuilder.setConcurrentRequests(concurrentRequests);
+ }
+ }
+ if (System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BULKACTIONS) != null) {
+ String bulkActionsStr = System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BULKACTIONS);
+ int bulkActions = Integer.parseInt(bulkActionsStr);
+ bulkProcessorBuilder.setBulkActions(bulkActions);
+ }
+ if (System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BULKSIZE) != null) {
+ String bulkSizeStr = System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BULKSIZE);
+ bulkProcessorBuilder.setBulkSize(ByteSizeValue.parseBytesSizeValue(bulkSizeStr, new ByteSizeValue(5, ByteSizeUnit.MB), CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BULKSIZE));
+ }
+ if (System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_FLUSHINTERVAL) != null) {
+ String flushIntervalStr = System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_FLUSHINTERVAL);
+ bulkProcessorBuilder.setFlushInterval(TimeValue.parseTimeValue(flushIntervalStr, null, CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_FLUSHINTERVAL));
+ } else {
+ // in ElasticSearch this defaults to null, but we would like to set a value to 5 seconds by default
+ bulkProcessorBuilder.setFlushInterval(new TimeValue(5, TimeUnit.SECONDS));
+ }
+ if (System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BACKOFFPOLICY) != null) {
+ String backoffPolicyStr = System.getProperty(CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BACKOFFPOLICY);
+ if (backoffPolicyStr != null && backoffPolicyStr.length() > 0) {
+ backoffPolicyStr = backoffPolicyStr.toLowerCase();
+ if ("nobackoff".equals(backoffPolicyStr)) {
+ bulkProcessorBuilder.setBackoffPolicy(BackoffPolicy.noBackoff());
+ } else if (backoffPolicyStr.startsWith("constant(")) {
+ int paramStartPos = backoffPolicyStr.indexOf("constant(" + "constant(".length());
+ int paramEndPos = backoffPolicyStr.indexOf(")", paramStartPos);
+ int paramSeparatorPos = backoffPolicyStr.indexOf(",", paramStartPos);
+ TimeValue delay = TimeValue.parseTimeValue(backoffPolicyStr.substring(paramStartPos, paramSeparatorPos), new TimeValue(5, TimeUnit.SECONDS), CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BACKOFFPOLICY );
+ int maxNumberOfRetries = Integer.parseInt(backoffPolicyStr.substring(paramSeparatorPos+1, paramEndPos));
+ bulkProcessorBuilder.setBackoffPolicy(BackoffPolicy.constantBackoff(delay, maxNumberOfRetries));
+ } else if (backoffPolicyStr.startsWith("exponential")) {
+ if (!backoffPolicyStr.contains("(")) {
+ bulkProcessorBuilder.setBackoffPolicy(BackoffPolicy.exponentialBackoff());
+ } else {
+ // we detected parameters, must process them.
+ int paramStartPos = backoffPolicyStr.indexOf("exponential(" + "exponential(".length());
+ int paramEndPos = backoffPolicyStr.indexOf(")", paramStartPos);
+ int paramSeparatorPos = backoffPolicyStr.indexOf(",", paramStartPos);
+ TimeValue delay = TimeValue.parseTimeValue(backoffPolicyStr.substring(paramStartPos, paramSeparatorPos), new TimeValue(5, TimeUnit.SECONDS), CONTEXTSERVER_ELASTICSEARCH_BULKPROCESSOR_BACKOFFPOLICY );
+ int maxNumberOfRetries = Integer.parseInt(backoffPolicyStr.substring(paramSeparatorPos+1, paramEndPos));
+ bulkProcessorBuilder.setBackoffPolicy(BackoffPolicy.exponentialBackoff(delay, maxNumberOfRetries));
+ }
+ }
+ }
+ }
+
+ bulkProcessor = bulkProcessorBuilder.build();
+ return bulkProcessor;
+ }
+
public void stop() {
new InClassLoaderExecute<Object>() {
protected Object execute(Object... args) {
logger.info("Closing ElasticSearch persistence backend...");
+ if (bulkProcessor != null) {
+ bulkProcessor.close();
+ }
node.close();
return null;
}
@@ -605,9 +712,14 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
String index = indexNames.containsKey(itemType) ? indexNames.get(itemType) :
(itemsMonthlyIndexed.contains(itemType) && dateHint != null ? getMonthlyIndex(dateHint) : indexName);
- client.prepareUpdate(index, itemType, itemId).setDoc(source)
- .execute()
- .actionGet();
+ if (bulkProcessor == null) {
+ client.prepareUpdate(index, itemType, itemId).setDoc(source)
+ .execute()
+ .actionGet();
+ } else {
+ UpdateRequest updateRequest = client.prepareUpdate(index, itemType, itemId).setDoc(source).request();
+ bulkProcessor.add(updateRequest);
+ }
return true;
} catch (IndexNotFoundException e) {
logger.debug("No index found for itemType=" + clazz.getName() + "itemId=" + itemId, e);
@@ -632,9 +744,14 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
(itemsMonthlyIndexed.contains(itemType) && dateHint != null ? getMonthlyIndex(dateHint) : indexName);
Script actualScript = new Script(script, ScriptService.ScriptType.INLINE, null, scriptParams);
- client.prepareUpdate(index, itemType, itemId).setScript(actualScript)
- .execute()
- .actionGet();
+ if (bulkProcessor == null) {
+ client.prepareUpdate(index, itemType, itemId).setScript(actualScript)
+ .execute()
+ .actionGet();
+ } else {
+ UpdateRequest updateRequest = client.prepareUpdate(index, itemType, itemId).setScript(actualScript).request();
+ bulkProcessor.add(updateRequest);
+ }
return true;
} catch (IndexNotFoundException e) {
logger.debug("No index found for itemType=" + clazz.getName() + "itemId=" + itemId, e);
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/285d4cc6/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 7263b28..06b83b0 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
@@ -812,7 +812,7 @@ public class SegmentServiceImpl implements SegmentService, SynchronousBundleList
}
}
- logger.info("Profiles past condition updated in {}", System.currentTimeMillis()-t);
+ logger.info("Profiles past condition updated in {}ms", System.currentTimeMillis()-t);
}
private void updateExistingProfilesForSegment(Segment segment) {
@@ -854,7 +854,7 @@ public class SegmentServiceImpl implements SegmentService, SynchronousBundleList
persistenceService.update(profileToRemove.getItemId(), null, Profile.class, "segments", profileToRemove.getSegments());
}
}
- logger.info("Profiles updated in {}", System.currentTimeMillis()-t);
+ logger.info("Profiles updated in {}ms", System.currentTimeMillis()-t);
}
private void updateExistingProfilesForScoring(Scoring scoring) {
@@ -888,7 +888,7 @@ public class SegmentServiceImpl implements SegmentService, SynchronousBundleList
eventService.send(entries.next().getValue());
}
}
- logger.info("Profiles updated in {}", System.currentTimeMillis()-t);
+ logger.info("Profiles updated in {}ms", System.currentTimeMillis()-t);
}
private void updateExistingProfilesForRemovedScoring(String scoringId) {
@@ -905,7 +905,7 @@ public class SegmentServiceImpl implements SegmentService, SynchronousBundleList
for (Profile profileToRemove : previousProfiles) {
persistenceService.updateWithScript(profileToRemove.getItemId(), null, Profile.class, "ctx._source.scores.remove(scoringId)", scriptParams);
}
- logger.info("Profiles updated in {}", System.currentTimeMillis()-t);
+ logger.info("Profiles updated in {}ms", System.currentTimeMillis()-t);
}
private String getMD5(String md5) {
[08/38] incubator-unomi git commit: rollback release 1.1.0-incubating
Posted by sh...@apache.org.
rollback release 1.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/e917bcd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e917bcd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e917bcd3
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: e917bcd3cc483d56deb1e87d9eab82c40be8a9b2
Parents: ac94540
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 18:06:48 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 18:06:48 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 92 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 0f06620..aae2df9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index f601a7c..31dcfae 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 6798bfe..4a35441 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index e1e7310..8a43483 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index d348ad9..d76cd02 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 7a1f6b6..90da5da 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index d7ebedb..1a3765c 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index aa9cb48..4591680 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 46e4315..28e653c 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index d6800cf..a3ae494 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index d13fe92..b6c8d3c 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e0426ce..b156a45 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 7d6c400..1fd7b0f 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 33e8eb9..eb6546b 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 72c7abd..2b51dec 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 891da68..eddadf1 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 9e361c0..8f576db 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index b029a8c..3158c80 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 99ef177..cf7a403 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 68d5ba7..0b14515 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 078cfb8..61e4a76 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index 979aa35..b866626 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 2bdcdd3..7bb2eca 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index f034ed2..573ff55 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 7f63535..9cffe34 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 35d1fbd..3587d92 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 908ec7c..043b430 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index bb47811..938f9ca 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9fa418..77224da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index bba4a5a..52f879a 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 8941427..d1278b4 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index c1725d5..b3834d8 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index abd3cc1..51f5999 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e917bcd3/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 5af699f..2eee85c 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[32/38] incubator-unomi git commit: UNOMI-59 : Handle update of
multivalued property - form mapping
Posted by sh...@apache.org.
UNOMI-59 : Handle update of multivalued property - form mapping
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/0f87d095
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0f87d095
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0f87d095
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 0f87d095a4cc444a64d374cc4249ae2105a8ac36
Parents: a0a87f3
Author: Abdelkader Midani <am...@jahia.com>
Authored: Wed Oct 19 16:35:28 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Oct 27 09:45:46 2016 +0200
----------------------------------------------------------------------
.../unomi/plugins/baseplugin/actions/SetPropertyAction.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0f87d095/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
index a731468..54ce89c 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
@@ -41,6 +41,9 @@ public class SetPropertyAction implements ActionExecutor {
String propertyName = (String) action.getParameterValues().get("setPropertyName");
Object propertyValue = action.getParameterValues().get("setPropertyValue");
+ if(propertyValue == null) {
+ propertyValue = action.getParameterValues().get("setPropertyValueMultiple");
+ }
Object propertyValueInteger = action.getParameterValues().get("setPropertyValueInteger");
if(propertyValueInteger != null && propertyValue == null) {
[36/38] incubator-unomi git commit: UNOMI-61 update version of mvel
from 2.1.9 to 2.3.1
Posted by sh...@apache.org.
UNOMI-61 update version of mvel from 2.1.9 to 2.3.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/ea1254f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/ea1254f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/ea1254f1
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: ea1254f121792b36ff356ac1f3f9c20f8b614427
Parents: 7382af5
Author: dgaillard <dg...@jahia.com>
Authored: Wed Nov 2 11:55:02 2016 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Wed Nov 2 11:55:02 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
.../org/apache/unomi/services/services/ProfileServiceImpl.java | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ea1254f1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f4ceb8..ce569ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -812,7 +812,7 @@
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
- <version>2.1.9.Final</version>
+ <version>2.3.1.Final</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ea1254f1/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 52aef50..e68eb9a 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
@@ -32,7 +32,6 @@ import org.apache.unomi.api.services.SegmentService;
import org.apache.unomi.persistence.spi.CustomObjectMapper;
import org.apache.unomi.persistence.spi.PersistenceService;
import org.apache.unomi.persistence.spi.PropertyHelper;
-import org.apache.unomi.services.actions.ActionExecutorDispatcher;
import org.osgi.framework.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,8 +54,6 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
private QueryService queryService;
- private ActionExecutorDispatcher actionExecutorDispatcher;
-
private Condition purgeProfileQuery;
private Integer purgeProfileExistTime = 0;
private Integer purgeProfileInactiveTime = 0;
[09/38] incubator-unomi git commit: Removed invalid reference to GPL
license
Posted by sh...@apache.org.
Removed invalid reference to GPL license
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/84b54455
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/84b54455
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/84b54455
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 84b54455f5c3eeff933bb640d3f54d26c1a55ec2
Parents: e917bcd
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 18:27:37 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 18:27:37 2016 +0200
----------------------------------------------------------------------
package/src/main/resources/LICENSE | 140 --------------------------------
1 file changed, 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/84b54455/package/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/package/src/main/resources/LICENSE b/package/src/main/resources/LICENSE
index 521d257..2424168 100644
--- a/package/src/main/resources/LICENSE
+++ b/package/src/main/resources/LICENSE
@@ -171,146 +171,6 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
-The GNU General Public License (GPL) Version 2, June 1991
-
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
- One line to give the program's name and a brief idea of what it does.
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- signature of Ty Coon, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
-Certain source files distributed by Sun Microsystems, Inc. are subject to the following clarification and special exception to the GPL Version 2, but only where Sun has expressly included in the particular source file's header the words
-
-"Sun designates this particular file as subject to the "Classpath" exception as provided by Sun in the License file that accompanied this code."
-
-Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
-
-As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.? An independent module is a module which is not derived from or based on this library.? If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.? If you do not wish to do so, delete this exception statement from your version.
-
-
-
xml-commons/java/external/LICENSE.dom-documentation.txt $Id: LICENSE.dom-documentation.txt 226215 2005-06-03 22:49:13Z mrglavas $
[34/38] incubator-unomi git commit: Merge PR#15
Posted by sh...@apache.org.
Merge PR#15
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/940ca9de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/940ca9de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/940ca9de
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 940ca9deb1df6ff2064ecda96bf4bf3b3286945f
Parents: 0f87d09 20e83a1
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Oct 27 09:52:27 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Oct 27 09:52:27 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[25/38] incubator-unomi git commit: Publish 1.1.0-incubating release
Posted by sh...@apache.org.
Publish 1.1.0-incubating release
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/e45bfd49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e45bfd49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e45bfd49
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: e45bfd49be64be2ac56d169c566944c7a3921f37
Parents: 6ac0bff
Author: Thomas Draier <dr...@apache.org>
Authored: Mon Oct 3 18:52:32 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Mon Oct 3 18:52:32 2016 +0200
----------------------------------------------------------------------
src/site/markdown/download.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e45bfd49/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md
index 00e190b..f08c6f7 100644
--- a/src/site/markdown/download.md
+++ b/src/site/markdown/download.md
@@ -17,14 +17,14 @@
# Downloading Apache Unomi
-## 1.0.1-incubating
+## 1.1.0-incubating
### Binaries
-* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating.tar.gz.asc))
-* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating.zip.asc))
+* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.tar.gz.asc))
+* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.zip.asc))
### Source code
-* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating-src.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating-src.tar.gz.asc))
-* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating-src.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.0.0-incubating/unomi-1.0.0-incubating-src.zip.asc))
+* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.tar.gz.asc))
+* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.zip.asc))
[14/38] incubator-unomi git commit: [maven-release-plugin] prepare
for next development iteration
Posted by sh...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/3ed69fae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/3ed69fae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/3ed69fae
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 3ed69fae0d1266c62ea62aedbfbe15223d365ca6
Parents: 35ac633
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 18:42:37 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 18:42:37 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 4abc419..0f06620 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 787b23d..f601a7c 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 2612b1e..6798bfe 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index f8cc06a..e1e7310 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 07f199b..d348ad9 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 0157100..7a1f6b6 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 822d736..d7ebedb 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 8e384b5..aa9cb48 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 391dbb9..46e4315 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index b30aa30..d6800cf 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 0a8c31f..d13fe92 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e20fec3..e0426ce 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 17df5d0..7d6c400 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index c8d01d2..3e67d7e 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 166b67d..72c7abd 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 39a139b..891da68 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 4a5e45d..9e361c0 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 6787395..b029a8c 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 94c5328..99ef177 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 37e1a98..68d5ba7 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 885c629..078cfb8 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index 3327b92..979aa35 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 5d04ffb..2bdcdd3 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 202e097..f034ed2 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9726f35..7f63535 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a3c6316..35d1fbd 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index b20df31..908ec7c 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 0151922..bb47811 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8796804..d9fa418 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>unomi-root-1.1.0-incubating</tag>
+ <tag>HEAD</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index c8187c1..bba4a5a 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 9aaf2fd..8941427 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index 676df5a..c1725d5 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index bd1394f..abd3cc1 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3ed69fae/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 4ee5c2b..5af699f 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[11/38] incubator-unomi git commit: [maven-release-plugin] prepare
release unomi-root-1.1.0-incubating
Posted by sh...@apache.org.
[maven-release-plugin] prepare release unomi-root-1.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/33e4d52f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/33e4d52f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/33e4d52f
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 33e4d52f2e6a752f67df4d9df95d7d16dacd8dcb
Parents: 76293f3
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 18:36:20 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 18:36:20 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index aae2df9..4abc419 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 31dcfae..787b23d 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 4a35441..2612b1e 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index 8a43483..f8cc06a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index d76cd02..07f199b 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 90da5da..0157100 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 1a3765c..822d736 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 4591680..8e384b5 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 28e653c..391dbb9 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index a3ae494..b30aa30 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index b6c8d3c..0a8c31f 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index b156a45..e20fec3 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 1fd7b0f..17df5d0 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index aea8712..c8d01d2 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 2b51dec..166b67d 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index eddadf1..39a139b 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 8f576db..4a5e45d 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 3158c80..6787395 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index cf7a403..94c5328 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 0b14515..37e1a98 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 61e4a76..885c629 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index b866626..3327b92 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 7bb2eca..5d04ffb 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 573ff55..202e097 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9cffe34..9726f35 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3587d92..a3c6316 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 043b430..b20df31 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 938f9ca..0151922 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 77224da..8796804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>unomi-root-1.1.0-incubating</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 52f879a..c8187c1 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index d1278b4..9aaf2fd 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index b3834d8..676df5a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 51f5999..bd1394f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/33e4d52f/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 2eee85c..4ee5c2b 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
[29/38] incubator-unomi git commit: UNOMI-59 : Handle update of
multivalued property
Posted by sh...@apache.org.
UNOMI-59 : Handle update of multivalued property
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b8cf1c6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b8cf1c6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b8cf1c6d
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: b8cf1c6d47ad908d0413e23ee2e6551159533fd9
Parents: ac31af9
Author: Abdelkader Midani <am...@jahia.com>
Authored: Fri Sep 30 18:15:43 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Mon Oct 24 16:19:29 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/unomi/services/services/ProfileServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b8cf1c6d/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 71fe2fd..9194d16 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
@@ -774,6 +774,7 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
Collection currentCollection = (Collection) target.get(newEntry.getKey());
if (currentCollection != null) {
if (!currentCollection.containsAll((Collection) newEntry.getValue())) {
+ currentCollection.clear();
changed |= currentCollection.addAll((Collection) newEntry.getValue());
}
} else {
[33/38] incubator-unomi git commit: UNOMI-59 : Handle update of
multivalued property
Posted by sh...@apache.org.
UNOMI-59 : Handle update of multivalued property
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/4c20fa6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/4c20fa6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/4c20fa6b
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 4c20fa6b90da96d02b85f3b030401920983fe266
Parents: d8c63f5
Author: Abdelkader Midani <am...@jahia.com>
Authored: Fri Sep 30 18:15:43 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Oct 27 09:45:46 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/unomi/services/services/ProfileServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4c20fa6b/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 71fe2fd..9194d16 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
@@ -774,6 +774,7 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
Collection currentCollection = (Collection) target.get(newEntry.getKey());
if (currentCollection != null) {
if (!currentCollection.containsAll((Collection) newEntry.getValue())) {
+ currentCollection.clear();
changed |= currentCollection.addAll((Collection) newEntry.getValue());
}
} else {
[05/38] incubator-unomi git commit: Use final version for miredot
Posted by sh...@apache.org.
Use final version for miredot
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/88ac0ec2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/88ac0ec2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/88ac0ec2
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 88ac0ec2ae31eed8ca9f77ff24ee55dc17ff8d51
Parents: f959b52
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 16:13:26 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 16:13:26 2016 +0200
----------------------------------------------------------------------
rest/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/88ac0ec2/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 09aebca..52f879a 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -167,7 +167,7 @@
<plugin>
<groupId>com.qmino</groupId>
<artifactId>miredot-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
<executions>
<execution>
<goals>
[22/38] incubator-unomi git commit: UNOMI-57 : cleaned notice file
Posted by sh...@apache.org.
UNOMI-57 : cleaned notice file
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/0feeb379
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0feeb379
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0feeb379
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 0feeb3791a338956ef13e85cdc8083caea7dc485
Parents: 0309ee5
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 17:02:45 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 17:02:45 2016 +0200
----------------------------------------------------------------------
package/src/main/resources/NOTICE | 659 ---------------------------------
1 file changed, 659 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0feeb379/package/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/package/src/main/resources/NOTICE b/package/src/main/resources/NOTICE
index b973722..770bd75 100644
--- a/package/src/main/resources/NOTICE
+++ b/package/src/main/resources/NOTICE
@@ -72,11 +72,6 @@ Groovy Language
Notice for org.apache.ws.xmlschema
---------------------------------------------------------------------------------------------------
-Apache WebServices - XmlSchema
-Copyright 2004-2014 The Apache Software Foundation
-
-
-
Portions Copyright 2006 International Business Machines Corp.
Portions Copyright (C) World Wide Web Consortium 2006, 2007 and licensed under the
@@ -84,374 +79,32 @@ three-part BSD license.
-Notice for org.apache.karaf.management
----------------------------------------------------------------------------------------------------
-Apache Karaf :: Management
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Management :: Boot
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Notice for org.apache.openwebbeans
----------------------------------------------------------------------------------------------------
-SPI definition
-Copyright 2008-2014 The Apache Software Foundation
-
-
-
-OSGi plugin
-Copyright 2008-2014 The Apache Software Foundation
-
-
-
-EL 2.2 plugin
-Copyright 2008-2014 The Apache Software Foundation
-
-
-
-OpenWebBeans Core
-Copyright 2008-2014 The Apache Software Foundation
-
-
-
-Web plugin
-Copyright 2008-2014 The Apache Software Foundation
-
-
-
Notice for org.apache.httpcomponents
---------------------------------------------------------------------------------------------------
-HttpCore
-Copyright 2005-2009 Apache Software Foundation
-
-
-
-Apache HttpComponents Client - HttpClient
-Copyright 1999-2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
This project contains annotations derived from JCIP-ANNOTATIONS
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
-Notice for org.apache.sshd
----------------------------------------------------------------------------------------------------
-Apache MINA SSHD
-Copyright 2008-2014 The Apache Software Foundation
-
-
-
Notice for org.apache.servicemix.bundles
---------------------------------------------------------------------------------------------------
-Apache ServiceMix :: Bundles :: spring-context
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix
-Copyright 2005-2012 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: spring-context-support
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: wsdl4j
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Streaming API for XML (STAX API 1.0)
-Copyright 2003-2007 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: spring-aop
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix
-Copyright 2005-2011 The Apache Software Foundation
-
-
-
-Apache XML Commons Resolver
-Copyright 2006 The Apache Software Foundation.
-
-
Portions of this code are derived from classes placed in the
public domain by Arbortext on 10 Apr 2000. See:
http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
-
-Apache ServiceMix :: Bundles :: spring-jms
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: xalan
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: xmlbeans
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: saaj-impl
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: FastInfoset
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: joda-time
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: spring-core
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: xercesImpl
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: jakarta-regexp
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: spring-expression
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: cglib
-Copyright 2005-2013 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: spring-beans
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache ServiceMix :: Bundles :: spring-tx
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Notice for commons-lang
----------------------------------------------------------------------------------------------------
-Apache Commons Lang
-Copyright 2001-2011 The Apache Software Foundation
-
-
-
-Notice for org.apache.karaf.features
----------------------------------------------------------------------------------------------------
-Apache Karaf :: Features :: Command
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Features :: Core
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Notice for org.apache.mina
----------------------------------------------------------------------------------------------------
-Apache MINA Core
-Copyright 2004-2012 Apache MINA Project
-
-
-
-Notice for org.apache.karaf.kar
----------------------------------------------------------------------------------------------------
-Apache Karaf :: KAR :: Command
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: KAR :: Core
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Notice for org.apache.karaf.jaas
----------------------------------------------------------------------------------------------------
-Apache Karaf :: JAAS :: Command
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: JAAS :: Boot
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: JAAS :: Modules
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: JAAS :: Config
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Notice for org.apache.karaf.bundle
----------------------------------------------------------------------------------------------------
-Apache Karaf :: Bundle :: Core
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Bundle :: Commands
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Bundle :: SpringStateService
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Notice for org.apache.karaf.deployer
----------------------------------------------------------------------------------------------------
-Apache Karaf :: Deployer :: Features
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Deployer :: Spring
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Deployer :: Karaf Archive (.kar)
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Deployer :: Wrap Non OSGi Jar
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Karaf :: Deployer :: Blueprint
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
Notice for joda-time
---------------------------------------------------------------------------------------------------
This product includes software developed by
Joda.org (http://www.joda.org/).
-
-Notice for org.opensaml
----------------------------------------------------------------------------------------------------
-Apache ServiceMix :: Bundles :: opensaml
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
Notice for org.apache.aries
---------------------------------------------------------------------------------------------------
-Apache Aries
-
This product includes software developed at
the OSGi Alliance (http://www.osgi.org/).
-
-Apache Aries Blueprint CM
-Copyright 2009-2014 The Apache Software Foundation
-
-
-
-Apache Aries Blueprint Core Compatiblity Fragment Bundle
-Copyright 2009-2012 The Apache Software Foundation
-
-
-
-Apache Aries Blueprint Core
-Copyright 2009-2014 The Apache Software Foundation
-
-
-
-Apache Aries Blueprint API
-Copyright 2009-2014 The Apache Software Foundation
-
-
-
-Apache Aries Util
-Copyright 2009-2013 The Apache Software Foundation
-
-
-
-Apache Aries Quiesce API
-Copyright 2009-2012 The Apache Software Foundation
-
-
-
-Apache Aries Proxy API
-Copyright 2009-2014 The Apache Software Foundation
-
-
-
-Apache Aries Proxy Service
-Copyright 2009-2014 The Apache Software Foundation
-
-
-
-Apache Aries JMX API
-Copyright 2009-2014 The Apache Software Foundation
-
-
-
-Apache Aries JMX Blueprint API
-Copyright 2009-2013 The Apache Software Foundation
-
-
-
-Apache Aries JMX Blueprint Core
-Copyright 2009-2013 The Apache Software Foundation
-
-
-
-Apache Aries JMX Whiteboard
-Copyright 2009-2012 The Apache Software Foundation
-
-
-
-Apache Aries JMX Core
-Copyright 2009-2014 The Apache Software Foundation
-
-
-
Notice for org.springframework.osgi
---------------------------------------------------------------------------------------------------
@@ -471,19 +124,8 @@ Notice for org.springframework.osgi
-Notice for org.apache.santuario
----------------------------------------------------------------------------------------------------
-Apache XML Security for Java
-Copyright 2000-2013 The Apache Software Foundation
-
-
-
Notice for org.apache.servicemix.specs
---------------------------------------------------------------------------------------------------
-
- Apache XML Commons XML APIs
- Copyright 1999-2009 The Apache Software Foundation.
-
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
@@ -520,38 +162,8 @@ Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
-Apache Felix Declarative Services
-Copyright 2006-2014 The Apache Software Foundation
-
-
-
-Apache Felix File Install
-Copyright 2006-2014 The Apache Software Foundation
-
-
-
-Apache Felix Metatype Service
-Copyright 2006-2014 The Apache Software Foundation
-
-
-
-Apache Felix Configuration Admin Service
-Copyright 2006-2013 The Apache Software Foundation
-
-
-
-Apache Felix Framework
-Copyright 2006-2013 The Apache Software Foundation
-
-
-
Notice for org.apache.cxf
---------------------------------------------------------------------------------------------------
-Apache CXF
-Copyright 2006-2014 The Apache Software Foundation
-
-
-
Portions of the file cxf-utils.js derives from code marked:
This code was written by Tyler Akins and has been placed in the
public domain. It would be nice if you left this header intact.
@@ -619,78 +231,12 @@ This product includes software Copyright University of Southampton IT Innovation
(http://www.it-innovation.soton.ac.uk).
-Apache CXF XJC Runtime
-Copyright 2006-2013 The Apache Software Foundation
-
-
-Notice for commons-beanutils
----------------------------------------------------------------------------------------------------
-Apache Commons BeanUtils
-Copyright 2000-2014 The Apache Software Foundation
-
-
Notice for org.apache.commons
---------------------------------------------------------------------------------------------------
-Apache Commons Email
-Copyright 2001-2014 The Apache Software Foundation
-
-
-
-Apache Commons Lang
-Copyright 2001-2014 The Apache Software Foundation
-
-
This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
-Notice for org.apache.karaf
----------------------------------------------------------------------------------------------------
-Apache Karaf and the following sub-projects:
-Copyright 2007-2014 The Apache Software Foundation
-
-Apache Karaf :: Client
-Apache Karaf :: Exception
-Apache Karaf :: Main
-Apache Karaf :: Package :: Commands
-Apache Karaf :: Package :: Core
-Apache Karaf :: ConfigAdmin :: Commands
-Apache Karaf :: ConfigAdmin :: Core
-Apache Karaf :: Log :: Command
-Apache Karaf :: Log :: Core
-Apache Karaf :: SCR :: Management MBeans
-Apache Karaf :: SCR :: Shell Commands
-Apache Karaf :: Web :: Commands
-Apache Karaf :: Web :: Core
-Apache Karaf :: System :: Shell Commands
-Apache Karaf :: System :: Core
-Apache Karaf :: Shell :: Various Commands
-Apache Karaf :: Shell :: Console
-Apache Karaf :: Shell :: Help System
-Apache Karaf :: Shell :: Table
-Apache Karaf :: Shell :: SSH
-Apache Karaf :: Diagnostic :: Command
-Apache Karaf :: Diagnostic :: Core
-Apache Karaf :: Service :: Guard
-Apache Karaf :: Service :: Command
-Apache Karaf :: Service :: Core
-Apache Karaf :: Instance :: Command
-Apache Karaf :: Instance :: Core
-Apache Karaf :: Wrapper :: Shell Commands
-Apache Karaf :: Wrapper :: Core
-Apache Karaf :: HTTP :: Commands
-Apache Karaf :: HTTP :: Core
-Apache Karaf :: Region :: Core
-Apache Karaf :: Region :: Persistence
-Apache Karaf :: Region :: Shell Commands
-
-
-Notice for commons-cli
----------------------------------------------------------------------------------------------------
-Apache Commons CLI
-Copyright 2001-2009 The Apache Software Foundation
-
-
Notice for com.fasterxml.jackson.core
---------------------------------------------------------------------------------------------------
# Jackson JSON processor
@@ -716,19 +262,8 @@ from the source code management (SCM) system project uses.
-Notice for commons-io
----------------------------------------------------------------------------------------------------
-Apache Commons IO
-Copyright 2002-2012 The Apache Software Foundation
-
-
-
Notice for commons-logging
---------------------------------------------------------------------------------------------------
-
-Commons Logging
-Copyright 2001-2007 The Apache Software Foundation
-
This product includes/uses software(s) developed by 'an unknown organization'
- Unnamed - avalon-framework:avalon-framework:jar:4.1.3
- Unnamed - log4j:log4j:jar:1.2.12
@@ -737,11 +272,6 @@ This product includes/uses software(s) developed by 'an unknown organization'
Notice for org.apache.neethi
---------------------------------------------------------------------------------------------------
-Apache Neethi
-Copyright 2004-2014 The Apache Software Foundation
-
-
-
This product is tested with testcases developed at W3C under the license:
http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
The source distribution of this product includes those testcases.
@@ -750,62 +280,6 @@ The source distribution of this product includes those testcases.
Notice for org.apache.geronimo.specs
---------------------------------------------------------------------------------------------------
-Apache ServiceMix
-Copyright 2007-2012 The Apache Software Foundation
-
-
-
-Apache Geronimo JSR-303 Bean Validation Spec API
-Copyright 2003-2010 The Apache Software Foundation
-
-
-
-Apache Geronimo Java Contexts and Dependency Injection (JSR-299) Spec API
-Copyright 2003-2010 The Apache Software Foundation
-
-
-
-Annotation 1.1
-Copyright 2003-2010 The Apache Software Foundation
-
-
-
-Apache Geronimo JSR-330 Spec API
-Copyright 2003-2010 The Apache Software Foundation
-
-
-
-Apache ServiceMix
-Copyright 2007-2014 The Apache Software Foundation
-
-
-
-Apache Geronimo Expression Language Spec 2.2
-Copyright 2003-2012 The Apache Software Foundation
-
-
-
-Interceptor 1.1
-Copyright 2003-2010 The Apache Software Foundation
-
-
-
-Apache Geronimo OSGI factory registry
-Copyright 2003-2011 The Apache Software Foundation
-
-
-
-Java Authentication SPI for Containers
-Copyright 2003-2010 The Apache Software Foundation
-
-
-
-Servlet 3.0
-Copyright 2003-2010 The Apache Software Foundation
-
-
-
-
This product includes software developed by
The W3C Consortium (http://www.w3.org/).
@@ -817,51 +291,6 @@ http://www.w3.org/Consortium/Legal/
-Apache Geronimo
-Copyright 2003-2008 The Apache Software Foundation
-
-
-Notice for commons-collections
----------------------------------------------------------------------------------------------------
-Apache Commons Collections
-Copyright 2001-2008 The Apache Software Foundation
-
-
-
-Notice for org.apache.xbean
----------------------------------------------------------------------------------------------------
-Apache XBean :: ASM 5 shaded (repackaged)
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache XBean :: Finder shaded (repackaged)
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache XBean :: Classpath Resource Finder
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache XBean OSGI Bundle Utilities
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Apache XBean :: Reflect
-Copyright 2005-2014 The Apache Software Foundation
-
-
-
-Notice for org.ops4j.pax.logging
----------------------------------------------------------------------------------------------------
-Apache log4j
-Copyright 2007 The Apache Software Foundation
-
-
-
Notice for net.sf.uadetector
---------------------------------------------------------------------------------------------------
The UADetector Project
@@ -901,91 +330,3 @@ obtained at:
* LICENSE.uas.txt (CC BY 3.0)
* HOMEPAGE:
* http://user-agent-string.info/
-
-
-Notice for org.apache.ws.security
----------------------------------------------------------------------------------------------------
-Apache WebServices - WSS4J
-Copyright 2004-2014 The Apache Software Foundation
-
-
-
-Notice for org.apache.unomi
----------------------------------------------------------------------------------------------------
-Apache Unomi :: Extensions :: Privacy :: Services
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Core Web Application
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Core Services
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Extensions :: Geonames Database :: REST API
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Plugins :: Base Actions and Conditions
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Plugins :: Request reading actions
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: REST API
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Extensions :: Geonames Database :: Service
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Plugins :: Mail notifications actions
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Specification API
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Persistence :: SPI (Service Provider Interface)
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Extensions :: Privacy :: REST API
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Extensions :: Lists :: REST API
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Extensions :: Lists :: Service
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Persistence :: ElasticSearch :: Core
-Copyright 2014-2016 Apache Software Foundation
-
-
-
-Apache Unomi :: Plugins :: Rules and Actions for optimization tests (A/B testing)
-Copyright 2014-2016 Apache Software Foundation
\ No newline at end of file
[13/38] incubator-unomi git commit: [maven-release-plugin] prepare
release unomi-root-1.1.0-incubating
Posted by sh...@apache.org.
[maven-release-plugin] prepare release unomi-root-1.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/35ac6339
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/35ac6339
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/35ac6339
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 35ac633931138ff1dbf10f2d0ffc15009ec9e1f4
Parents: 623ccd8
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 18:42:19 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 18:42:19 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index aae2df9..4abc419 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 31dcfae..787b23d 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 4a35441..2612b1e 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index 8a43483..f8cc06a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index d76cd02..07f199b 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 90da5da..0157100 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 1a3765c..822d736 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 4591680..8e384b5 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 28e653c..391dbb9 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index a3ae494..b30aa30 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index b6c8d3c..0a8c31f 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index b156a45..e20fec3 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 1fd7b0f..17df5d0 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index aea8712..c8d01d2 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 2b51dec..166b67d 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index eddadf1..39a139b 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 8f576db..4a5e45d 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 3158c80..6787395 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index cf7a403..94c5328 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 0b14515..37e1a98 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 61e4a76..885c629 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index b866626..3327b92 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 7bb2eca..5d04ffb 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 573ff55..202e097 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9cffe34..9726f35 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3587d92..a3c6316 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 043b430..b20df31 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 938f9ca..0151922 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 77224da..8796804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>unomi-root-1.1.0-incubating</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 52f879a..c8187c1 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index d1278b4..9aaf2fd 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index b3834d8..676df5a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 51f5999..bd1394f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/35ac6339/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 2eee85c..4ee5c2b 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
[17/38] incubator-unomi git commit: Revert "[maven-release-plugin]
prepare for next development iteration"
Posted by sh...@apache.org.
Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 3ed69fae0d1266c62ea62aedbfbe15223d365ca6.
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/a723d01d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a723d01d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a723d01d
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: a723d01df878260ff2bb7eee08cdc7cb4fece84b
Parents: 7169139
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 15:10:19 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 15:10:19 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 0f06620..4abc419 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index f601a7c..787b23d 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 6798bfe..2612b1e 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index e1e7310..f8cc06a 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index d348ad9..07f199b 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 7a1f6b6..0157100 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index d7ebedb..822d736 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index aa9cb48..8e384b5 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 46e4315..391dbb9 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index d6800cf..b30aa30 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index d13fe92..0a8c31f 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e0426ce..e20fec3 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 7d6c400..17df5d0 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 3e67d7e..c8d01d2 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 72c7abd..166b67d 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 891da68..39a139b 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 9e361c0..4a5e45d 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index b029a8c..6787395 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 99ef177..94c5328 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 68d5ba7..37e1a98 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 078cfb8..885c629 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index 979aa35..3327b92 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 2bdcdd3..5d04ffb 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index f034ed2..202e097 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 7f63535..9726f35 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 35d1fbd..a3c6316 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 1764ed1..0fd8b3b 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index bb47811..0151922 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9fa418..8796804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>unomi-root-1.1.0-incubating</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index bba4a5a..c8187c1 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 8941427..9aaf2fd 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index c1725d5..676df5a 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.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index abd3cc1..bd1394f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a723d01d/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 5af699f..4ee5c2b 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
[20/38] incubator-unomi git commit: UNOMI-57 : Added repository for
uadetector
Posted by sh...@apache.org.
UNOMI-57 : Added repository for uadetector
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9ab88f5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9ab88f5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9ab88f5e
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 9ab88f5eeb3503f1a4d95a024c362f037c226dcc
Parents: 9dff31f
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 16:22:45 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 16:22:45 2016 +0200
----------------------------------------------------------------------
pom.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9ab88f5e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 77224da..156f309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,9 +239,12 @@
<name>Apache ServiceMix M2</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
</repository>
+ <repository>
+ <id>jahia.3rdparty</id>
+ <url>https://devtools.jahia.com/nexus/content/repositories/thirdparty-releases/</url>
+ </repository>
</repositories>
-
<profiles>
<profile>
<id>integration-tests</id>
[27/38] incubator-unomi git commit: UNOMI-60 inject blueprint bundle
context into PrivacyServiceImpl so we can get and return current version of
UNOMI instead of hardcoded value
Posted by sh...@apache.org.
UNOMI-60 inject blueprint bundle context into PrivacyServiceImpl so we can get and return current version of UNOMI instead of hardcoded value
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/d8c63f58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/d8c63f58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/d8c63f58
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: d8c63f58fe4c6ed6423dd3ba835431506006c945
Parents: ac31af9
Author: dgaillard <dg...@jahia.com>
Authored: Thu Oct 20 17:51:12 2016 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Thu Oct 20 17:51:12 2016 +0200
----------------------------------------------------------------------
extensions/privacy-extension/services/pom.xml | 5 +++++
.../apache/unomi/privacy/internal/PrivacyServiceImpl.java | 8 +++++++-
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d8c63f58/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index d13fe92..4afcde8 100644
--- a/extensions/privacy-extension/services/pom.xml
+++ b/extensions/privacy-extension/services/pom.xml
@@ -48,6 +48,11 @@
<artifactId>cxf-rt-rs-security-cors</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d8c63f58/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java b/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
index ce97f52..87604ba 100644
--- a/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
+++ b/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
@@ -23,6 +23,7 @@ import org.apache.unomi.api.services.PrivacyService;
import org.apache.unomi.api.services.ProfileService;
import org.apache.unomi.persistence.spi.PersistenceService;
import org.apache.unomi.persistence.spi.aggregate.TermsAggregate;
+import org.osgi.framework.BundleContext;
import java.util.*;
@@ -35,6 +36,7 @@ public class PrivacyServiceImpl implements PrivacyService {
private ProfileService profileService;
private EventService eventService;
private List<String> defaultDeniedProperties;
+ private BundleContext bundleContext;
public void setPersistenceService(PersistenceService persistenceService) {
this.persistenceService = persistenceService;
@@ -56,11 +58,15 @@ public class PrivacyServiceImpl implements PrivacyService {
this.defaultDeniedProperties = Arrays.asList(defaultDeniedProperties.split(","));
}
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
@Override
public ServerInfo getServerInfo() {
ServerInfo serverInfo = new ServerInfo();
serverInfo.setServerIdentifier("Apache Unomi");
- serverInfo.setServerVersion("2.0.0.incubating-SNAPSHOT");
+ serverInfo.setServerVersion(bundleContext.getBundle().getVersion().toString());
// let's retrieve all the event types the server has seen.
Map<String,Long> eventTypeCounts = persistenceService.aggregateQuery(null, new TermsAggregate("eventType"), Event.ITEM_TYPE);
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d8c63f58/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 ea4df97..2755772 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
@@ -43,6 +43,7 @@
<property name="eventService" ref="eventService" />
<property name="profileService" ref="profileService" />
<property name="defaultDeniedProperties" value="${defaultDeniedProperties}" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
<service id="privacyService" ref="privacyServiceImpl" auto-export="interfaces"/>
</blueprint>
[02/38] incubator-unomi git commit: UNOMI-53 : goalMatchCondition :
default value for goalId
Posted by sh...@apache.org.
UNOMI-53 : goalMatchCondition : default value for goalId
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9a53c2f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9a53c2f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9a53c2f4
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 9a53c2f483476951930a2d740cf3948b0c5b870e
Parents: f47e846
Author: Abdelkader Midani <am...@jahia.com>
Authored: Wed Sep 7 16:58:04 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Wed Sep 7 16:58:33 2016 +0200
----------------------------------------------------------------------
.../resources/META-INF/cxs/conditions/goalMatchCondition.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9a53c2f4/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
index 6c4e796..417f01d 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
@@ -21,7 +21,8 @@
{
"id": "goalId",
"type": "string",
- "multivalued": false
+ "multivalued": false,
+ "defaultValue": ""
},
{
"id": "comparisonOperator",
[03/38] incubator-unomi git commit: UNOMI-32 remove property if the
property is present in the object with a null value
Posted by sh...@apache.org.
UNOMI-32 remove property if the property is present in the object with a null value
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/0bb17729
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0bb17729
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0bb17729
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 0bb17729c5dbd461721d8d9487b8b278cda87091
Parents: 9a53c2f
Author: dgaillard <dg...@jahia.com>
Authored: Mon Sep 12 17:55:19 2016 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Mon Sep 12 17:55:19 2016 +0200
----------------------------------------------------------------------
.../services/services/ProfileServiceImpl.java | 37 +++++++++++---------
1 file changed, 21 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0bb17729/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 eaf8d98..71fe2fd 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
@@ -766,35 +766,40 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
return false;
}
- private boolean merge(Map<String,Object> target, Map<String,Object> object) {
+ private boolean merge(Map<String, Object> target, Map<String, Object> object) {
boolean changed = false;
- for (Map.Entry<String, Object> previousEntry : object.entrySet()) {
- if (previousEntry.getValue() != null) {
- if (previousEntry.getValue() instanceof Collection) {
- Collection currentCollection = (Collection) target.get(previousEntry.getKey());
+ for (Map.Entry<String, Object> newEntry : object.entrySet()) {
+ if (newEntry.getValue() != null) {
+ if (newEntry.getValue() instanceof Collection) {
+ Collection currentCollection = (Collection) target.get(newEntry.getKey());
if (currentCollection != null) {
- if (!currentCollection.containsAll((Collection) previousEntry.getValue())) {
- changed |= currentCollection.addAll((Collection) previousEntry.getValue());
+ if (!currentCollection.containsAll((Collection) newEntry.getValue())) {
+ changed |= currentCollection.addAll((Collection) newEntry.getValue());
}
} else {
- target.put(previousEntry.getKey(), previousEntry.getValue());
+ target.put(newEntry.getKey(), newEntry.getValue());
changed = true;
}
- } else if (previousEntry.getValue() instanceof Map) {
- Map<String,Object> currentMap = (Map) target.get(previousEntry.getKey());
+ } else if (newEntry.getValue() instanceof Map) {
+ Map<String,Object> currentMap = (Map) target.get(newEntry.getKey());
if (currentMap == null) {
- target.put(previousEntry.getKey(), previousEntry.getValue());
+ target.put(newEntry.getKey(), newEntry.getValue());
changed = true;
} else {
- changed |= merge(currentMap, (Map) previousEntry.getValue());
+ changed |= merge(currentMap, (Map) newEntry.getValue());
}
- } else if (previousEntry.getValue().getClass().getPackage().getName().equals("java.lang")) {
- if (previousEntry.getValue() != null && !previousEntry.getValue().equals(target.get(previousEntry.getKey()))) {
- target.put(previousEntry.getKey(), previousEntry.getValue());
+ } else if (newEntry.getValue().getClass().getPackage().getName().equals("java.lang")) {
+ if (newEntry.getValue() != null && !newEntry.getValue().equals(target.get(newEntry.getKey()))) {
+ target.put(newEntry.getKey(), newEntry.getValue());
changed = true;
}
} else {
- changed |= merge(target.get(previousEntry.getKey()), previousEntry.getValue());
+ changed |= merge(target.get(newEntry.getKey()), newEntry.getValue());
+ }
+ } else {
+ if (target.containsKey(newEntry.getKey())) {
+ target.remove(newEntry.getKey());
+ changed = true;
}
}
}
[18/38] incubator-unomi git commit: Revert "[maven-release-plugin]
prepare release unomi-root-1.1.0-incubating"
Posted by sh...@apache.org.
Revert "[maven-release-plugin] prepare release unomi-root-1.1.0-incubating"
This reverts commit 35ac633931138ff1dbf10f2d0ffc15009ec9e1f4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/13cd1011
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/13cd1011
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/13cd1011
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 13cd10115aa31970ce130e5747e8012a50e1d764
Parents: a723d01
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 15:10:32 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 15:10:32 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 4abc419..aae2df9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 787b23d..31dcfae 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 2612b1e..4a35441 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index f8cc06a..8a43483 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 07f199b..d76cd02 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 0157100..90da5da 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 822d736..1a3765c 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 8e384b5..4591680 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 391dbb9..28e653c 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index b30aa30..a3ae494 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 0a8c31f..b6c8d3c 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.1.0-incubating</version>
+ <version>1.1.0-incubating-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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e20fec3..b156a45 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 17df5d0..1fd7b0f 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index c8d01d2..aea8712 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 166b67d..2b51dec 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 39a139b..eddadf1 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 4a5e45d..8f576db 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 6787395..3158c80 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 94c5328..cf7a403 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 37e1a98..0b14515 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 885c629..61e4a76 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index 3327b92..b866626 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 5d04ffb..7bb2eca 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 202e097..573ff55 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9726f35..9cffe34 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a3c6316..3587d92 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 0fd8b3b..492be7c 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 0151922..938f9ca 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8796804..77224da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>unomi-root-1.1.0-incubating</tag>
+ <tag>HEAD</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index c8187c1..52f879a 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 9aaf2fd..d1278b4 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index 676df5a..b3834d8 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.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index bd1394f..51f5999 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/13cd1011/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 4ee5c2b..2eee85c 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[23/38] incubator-unomi git commit: [maven-release-plugin] prepare
release unomi-root-1.1.0-incubating
Posted by sh...@apache.org.
[maven-release-plugin] prepare release unomi-root-1.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/619e51f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/619e51f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/619e51f5
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 619e51f509cd2fc72a9cb24357d33596094c5d25
Parents: 0feeb37
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 29 17:19:57 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 29 17:19:57 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index aae2df9..4abc419 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 31dcfae..787b23d 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 4a35441..2612b1e 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index 8a43483..f8cc06a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index d76cd02..07f199b 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 90da5da..0157100 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 1a3765c..822d736 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 4591680..8e384b5 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 28e653c..391dbb9 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index a3ae494..b30aa30 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index b6c8d3c..0a8c31f 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index b156a45..e20fec3 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 1fd7b0f..17df5d0 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index d046a6a..695813c 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 2b51dec..166b67d 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index eddadf1..39a139b 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 8f576db..4a5e45d 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 3158c80..6787395 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index cf7a403..94c5328 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 0b14515..37e1a98 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 61e4a76..885c629 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index b866626..3327b92 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 7bb2eca..5d04ffb 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 573ff55..202e097 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9cffe34..9726f35 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3587d92..a3c6316 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 492be7c..0fd8b3b 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 938f9ca..0151922 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 156f309..acee602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>unomi-root-1.1.0-incubating</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 52f879a..c8187c1 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index d1278b4..9aaf2fd 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index b3834d8..676df5a 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.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 51f5999..bd1394f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/619e51f5/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 2eee85c..4ee5c2b 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
+ <version>1.1.0-incubating</version>
<scope>provided</scope>
</dependency>
[31/38] incubator-unomi git commit: UNOMI-59 : Handle update of
multivalued property
Posted by sh...@apache.org.
UNOMI-59 : Handle update of multivalued property
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/a0a87f30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a0a87f30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a0a87f30
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: a0a87f30ee765d9914d1b8b7e523880cc6a66f40
Parents: 4c20fa6
Author: Abdelkader Midani <am...@jahia.com>
Authored: Tue Oct 11 18:27:34 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Oct 27 09:45:46 2016 +0200
----------------------------------------------------------------------
.../unomi/services/services/ProfileServiceImpl.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a0a87f30/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 9194d16..52aef50 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
@@ -771,16 +771,8 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
for (Map.Entry<String, Object> newEntry : object.entrySet()) {
if (newEntry.getValue() != null) {
if (newEntry.getValue() instanceof Collection) {
- Collection currentCollection = (Collection) target.get(newEntry.getKey());
- if (currentCollection != null) {
- if (!currentCollection.containsAll((Collection) newEntry.getValue())) {
- currentCollection.clear();
- changed |= currentCollection.addAll((Collection) newEntry.getValue());
- }
- } else {
- target.put(newEntry.getKey(), newEntry.getValue());
- changed = true;
- }
+ target.put(newEntry.getKey(), newEntry.getValue());
+ changed = true;
} else if (newEntry.getValue() instanceof Map) {
Map<String,Object> currentMap = (Map) target.get(newEntry.getKey());
if (currentMap == null) {
[26/38] incubator-unomi git commit: Fixed checksum link in download
page
Posted by sh...@apache.org.
Fixed checksum link in download page
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/ac31af94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/ac31af94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/ac31af94
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: ac31af942dfc828c3acb654277a8e663cbf4356e
Parents: e45bfd4
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Oct 4 09:27:59 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Oct 4 09:27:59 2016 +0200
----------------------------------------------------------------------
src/site/markdown/download.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac31af94/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md
index f08c6f7..209f6d0 100644
--- a/src/site/markdown/download.md
+++ b/src/site/markdown/download.md
@@ -21,10 +21,10 @@
### Binaries
-* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.tar.gz.asc))
-* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.zip.asc))
+* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.tar.gz.md5) - [signature](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.tar.gz.asc))
+* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.zip.md5) - [signature](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating.zip.asc))
### Source code
-* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.tar.gz.asc))
-* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.zip.asc))
+* [tar.gz](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.tar.gz) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.tar.gz.md5) - [signature](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.tar.gz.asc))
+* [zip](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.zip) ([checksum](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.zip.md5) - [signature](http://www.apache.org/dyn/closer.lua/incubator/unomi/1.1.0-incubating/unomi-1.1.0-incubating-src.zip.asc))
[15/38] incubator-unomi git commit: UNOMI-56 : Add
setPropertyValueMultiple in setPropertyAction.json
Posted by sh...@apache.org.
UNOMI-56 : Add setPropertyValueMultiple in setPropertyAction.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/36bc5d27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/36bc5d27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/36bc5d27
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 36bc5d272d8bfe101ea9ce96fc35a2b145d8d686
Parents: 3ed69fa
Author: Abdelkader Midani <am...@jahia.com>
Authored: Wed Sep 21 18:22:19 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Wed Sep 21 18:23:31 2016 +0200
----------------------------------------------------------------------
.../plugins/baseplugin/actions/SetPropertyAction.java | 11 ++++++++---
.../META-INF/cxs/actions/setPropertyAction.json | 5 +++++
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/36bc5d27/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
index a731468..25c4b0e 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
@@ -42,11 +42,16 @@ public class SetPropertyAction implements ActionExecutor {
Object propertyValue = action.getParameterValues().get("setPropertyValue");
Object propertyValueInteger = action.getParameterValues().get("setPropertyValueInteger");
+ Object setPropertyValueMultiple = action.getParameterValues().get("setPropertyValueMultiple");
- if(propertyValueInteger != null && propertyValue == null) {
- propertyValue = PropertyHelper.getInteger(propertyValueInteger);
+ if (propertyValue == null) {
+ if (propertyValueInteger != null) {
+ propertyValue = PropertyHelper.getInteger(propertyValueInteger);
+ }
+ if(setPropertyValueMultiple != null) {
+ propertyValue = setPropertyValueMultiple;
+ }
}
-
if (propertyValue != null && propertyValue.equals("now")) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
format.setTimeZone(TimeZone.getTimeZone("UTC"));
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/36bc5d27/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
index 630f5ac..ff72333 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
@@ -26,6 +26,11 @@
"multivalued": false
},
{
+ "id": "setPropertyValueMultiple",
+ "type": "string",
+ "multivalued": true
+ },
+ {
"id": "setPropertyStrategy",
"type": "string",
"multivalued": false
[04/38] incubator-unomi git commit: Added key
Posted by sh...@apache.org.
Added key
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f959b52e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f959b52e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f959b52e
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: f959b52e246f3405b7e6e65ef53fce29421c2cc7
Parents: 0bb1772
Author: Thomas Draier <dr...@apache.org>
Authored: Thu Sep 15 14:46:58 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Thu Sep 15 14:46:58 2016 +0200
----------------------------------------------------------------------
KEYS | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f959b52e/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index 2f3e33a..3e47742 100644
--- a/KEYS
+++ b/KEYS
@@ -44,3 +44,61 @@ pdPMxo9vSgCffR7e7F599r0tQzKE96Tyt2nFboEAn2Toiq7YShB4/YizKX1qSXM1
wWyR
=MgXO
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/6E3C1DCC 2016-09-15
+uid Thomas Draier (CODE SIGNING KEY) <dr...@apache.org>
+sig 3 6E3C1DCC 2016-09-15 Thomas Draier (CODE SIGNING KEY) <dr...@apache.org>
+sub 4096R/33044770 2016-09-15
+sig 6E3C1DCC 2016-09-15 Thomas Draier (CODE SIGNING KEY) <dr...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFfalBQBEACxsaPloysjdBFe8KGO1zpxrin4WAWhCmNtKhG6BoeOtI7PsD4p
+uTZitayrSXDp658UewgXpfJxeYOlshhfaqG4kBFa1ydgM820ChJ9lpnF+7Bz49En
+zKAk+ZL+69/9rZqDFkUxeirKyI8gm3oIKr0sfHV+s5W+L4hU7gRwVkgIm60wqXAP
+2VUAfWEieHepZ20JXXMsxvAV3GL3vRZgq2p6DTPOym9oHrkMg9aeShbFkf9TSXoU
+i5YBrCTZhQziVrfcSlDzT/MY9GIz7YWAEUmJay0sgNM43M0RjKpDkoJe52DbpR5B
+ZmK5H7MfAFy5aGTP9FAmIXghkzQYtJ+rE72NLzm01GkcWatUc0SAwo3s8ipDHoLy
+sd4FQi1kPd6YuH4X2epswGia5R7zgGvJZ4d+RJ0m/G3iJT6Bfa21EyTVWNUUjjv0
+kAvNX5U0GrSxsct+GvcsR5V8mv7M6eqQISuhM5r6/f50NfCWnsF3wgbVNFF4RjYi
+gdB7tdHg2jVFBwzoRN1HAXJyrg9KnjZ/jPV2MELsmuoix8LaAqpyENBqKUDhBuJb
+cF5OsMGESji6+keoXoaoufTKiO4Kv+MxSyXvDmzexrxm512S4MZy7lCOQOyZAhmc
+quz9M00nTxUvmRdakqbZh1hdY+3sFabST3c8S7BLjAoyDx6cKALTGpt8XwARAQAB
+tDRUaG9tYXMgRHJhaWVyIChDT0RFIFNJR05JTkcgS0VZKSA8ZHJhaWVyQGFwYWNo
+ZS5vcmc+iQI3BBMBCgAhBQJX2pQUAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheA
+AAoJECX3fTFuPB3McFQP/0G5N9aUvQaXHBE+EufkDlFsP2NiaERZmiUH8ayZgmkA
+EcDoqAcaQC7DR8PyKN3ROmZ7GuF9Ec9A/vTzeBq9cpYFSc23xpO+cW6XOQlpCOvH
+o6ifPtzj/i+hrxZp14o3VMNLE7psrCq7gjsuyCDah1mIIL5LnttzEt6Ycjyellxk
+4+hy0aiz4F6WPaGQAesD2CSBPVXzB/Iooa1aKdip48duQTO6Ov/Q8iYBnH/FTboI
+oAML1nT01uRx6NRJlWN7JqlfcMSiOHDaOdfsNgogsdcuKcMCa64Jw7GnIylrzaM5
+WdZ6Isq7KzOhdH1VsANqC8cHWikrNZgOCLIFZUfB0DOs4POYEnS1djV0RArOLwbc
+FkXf5rHdEzp0K6Lsdi8uVDHyjlOVfBvIJ1LeI24lg9T9KGvKamNWjbr0aH857WUL
+akZtds9BbZa9BHmPMnU1HPxmL76D6KW4gGCfyDpd3qJ4wNxf1Cv5Srm6GBrmix6o
+z5K3jolbDGU6jQkKBa9S7UySCeL8Peuj5d0qpg/Ulq4kA7BA0vr54SWWyMTEU+gW
+dqsZNZ659O/yn7ZSoo8hGlwrd5Fa4mg8TcrgfDqoeEkhwNfe0u0rC1LHirxj89xR
+UAvl7F/CW9bwGMOnuhk5vcL95C4ZCgx59gXoBuOAktf6ahwTYgQUuOiTn/sZRQ8U
+uQINBFfalBQBEADlCrbTRE53bvBr3lYJb3Wx/sD0SHJKTP23bEHXOOmIqTodlIQz
+ilGS3E81ndBd2aJjeUhRGIqayi+iLczMiZlVNxZtI7U5TVj/51T4olNA+gPR9fir
+QjXebA5VeW/xG+0d79o/lEzZcKp8m7EGa58v+rpe3SZ6JJLWhsQJH/dTKyT7/qvY
+HnWGqLHHbgspClU4jhsieNYKWrjUdmW9tBfoNeuIOGV/vEDkKTZRFuqxQ87ekiLa
+mXxMbIjKStTgKsz0jer/NaKDrTPWVxbWHRcYWMrZyxzplTfUTUzN03DrEcI3RNL7
+gN+EtAbNta7RAPpJc6eGFvVZ5GH4eN2OjkCxYVFb9KBCHEz10B+tegfdHVSQVPYQ
+uBs4suEpdgJL0bflxmazAAKldWU2BtP0PjOKns1yfktW+T2wCgoyytLLkHT9AWce
+KLl/VaZbbEfWLkve1CIxr7sB3G7D1gCbV5m8Iw5B2TxkArAM5dDrr3wDhK/oRoFV
+5eSFXADNjkrCQ7WT2hEvECgVqEf9QtHkkHrg4eKNGE6HyIrguG8JhsKu/FyRboRM
+qtXV0zaLG3G0JJuzOi9w3b4GTBsIG3a/g31dxu9G3mi2oXxVz9cXe+XHvuVeNb7c
+6QOmp0p1KsZI3/khUXRbfKYcF27NHNuv9NGQYLRQ5V+9vpMGNwB9fF6AvwARAQAB
+iQIfBBgBCgAJBQJX2pQUAhsMAAoJECX3fTFuPB3M0jUQAK1UTEacu5cDrUUd0zzq
+fBRFUtHaRbPYeakVh5j5OqrOBFKE/N3mMK682TD0vhr9Qwkok6dAJCKqGJPcEiFZ
+FC0mrXuFCSu5ogpupfWIv3bx+dQQqjlu0GSI8o9AH1WOYnYqVaEWaGI/NUA/UKBm
+EBrHQ+mvcZqByf1mLz+FcId3VC8u7FBt61qw/pnIR9PUiRkmuVor/M6VZJ6T6Qvd
+dg5/rOYjpIPXM7HSJevTVpVfkW33Cickc+JbOfcNCcDdZ/W9GuhsoICTx1WRA97B
+8EyQ5o1hpxB1Lllmwyqpl2MrmBgnvZixWUv3K/52CYo7/qOTy4vZTM6N7tSrRXPV
+bwimYfqQQGxJmtMDhchnZw6I7xfJEGMdZvIJx5YWA4Fzr6mskhnt07+YfGa003+A
+CsQR5kxwtuxNFBzCy8Eq+1yyCdXK/uygtJvXUrpt5NcGwoCTbhzIzvh0CVWW/TPf
+7HP2wG9qX4mKALj/nc/Hohtw7q0q7km5yWMHPrkwNBgNAWYrNIjjbOspRmW3FINQ
+Z3irWR1qJmfCneYALG3+F1toQDzwWO2AXxxAsPWD3m9rhUBDDewfyHVrHKfURrlJ
+De85yo9XvadBg9OHT5TXk3JBunAsZicNte0+deOALvq4yvYkLVkwSCOkY0nP5cJO
+pc9yvM78hnDVnOUkITH5gpEV
+=fKcW
+-----END PGP PUBLIC KEY BLOCK-----
[07/38] incubator-unomi git commit: [maven-release-plugin] prepare
for next development iteration
Posted by sh...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/ac94540f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/ac94540f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/ac94540f
Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: ac94540f2eb52f7efe77b841fbf89a255c8ec9e3
Parents: f07b872
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Sep 20 16:29:37 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Sep 20 16:29:37 2016 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/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 +++---
itests/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
package/pom.xml | 4 +--
performance-tests/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
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 | 4 +--
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
34 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 4abc419..0f06620 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 787b23d..f601a7c 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 2612b1e..6798bfe 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index f8cc06a..e1e7310 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 07f199b..d348ad9 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 0157100..7a1f6b6 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index 822d736..d7ebedb 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 8e384b5..aa9cb48 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 391dbb9..46e4315 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index b30aa30..d6800cf 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 0a8c31f..d13fe92 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.1.0-incubating</version>
+ <version>1.2.0-incubating-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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e20fec3..e0426ce 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -31,19 +31,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 17df5d0..7d6c400 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -33,72 +33,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index be2752c..33e8eb9 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 166b67d..72c7abd 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index 39a139b..891da68 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 4a5e45d..9e361c0 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index 6787395..b029a8c 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 94c5328..99ef177 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 37e1a98..68d5ba7 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 885c629..078cfb8 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index 3327b92..979aa35 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index 5d04ffb..2bdcdd3 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 202e097..f034ed2 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index 9726f35..7f63535 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index a3c6316..35d1fbd 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index b20df31..908ec7c 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 0151922..bb47811 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8796804..d9fa418 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
provides a high-performance user profile and event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
@@ -99,7 +99,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</developerConnection>
- <tag>unomi-root-1.1.0-incubating</tag>
+ <tag>HEAD</tag>
<url>https://git-wip-us.apache.org/repos/asf/incubator-unomi.git</url>
</scm>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index c8187c1..bba4a5a 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 9aaf2fd..8941427 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index 676df5a..c1725d5 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.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index bd1394f..abd3cc1 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ac94540f/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index 4ee5c2b..5af699f 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.1.0-incubating</version>
+ <version>1.2.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>