[jgitflow-maven-plugin]merging 'feature-UNOMI-5-KARAF4-1' into 'master' Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/08205413 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/08205413 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/08205413
Branch: refs/heads/master Commit: 082054139b6e4d949009f68ad41f1c3ac8acbb8a Parents: 6ef0e34 bf8c609 Author: Serge Huber <[email protected]> Authored: Thu Mar 8 14:29:42 2018 +0100 Committer: Serge Huber <[email protected]> Committed: Thu Mar 8 14:29:42 2018 +0100 ---------------------------------------------------------------------- api/pom.xml | 2 +- .../java/org/apache/unomi/api/EventInfo.java | 3 - .../java/org/apache/unomi/api/Parameter.java | 2 - .../java/org/apache/unomi/api/PartialList.java | 2 - .../java/org/apache/unomi/api/ServerInfo.java | 2 - .../java/org/apache/unomi/api/ValueType.java | 2 - .../org/apache/unomi/api/actions/Action.java | 2 - .../apache/unomi/api/conditions/Condition.java | 2 - .../unomi/api/conditions/ConditionType.java | 12 +- .../org/apache/unomi/api/lists/UserList.java | 3 - .../unomi/api/segments/DependentMetadata.java | 2 - .../org/apache/unomi/api/segments/Scoring.java | 2 - .../unomi/api/segments/ScoringElement.java | 2 - .../org/apache/unomi/api/segments/Segment.java | 3 - common/pom.xml | 6 +- extensions/geonames/pom.xml | 2 +- extensions/geonames/rest/pom.xml | 8 +- extensions/geonames/services/pom.xml | 8 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- extensions/lists-extension/actions/pom.xml | 8 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- extensions/lists-extension/pom.xml | 4 +- extensions/lists-extension/rest/pom.xml | 8 +- extensions/lists-extension/services/pom.xml | 8 +- .../java/org/apache/unomi/lists/UserList.java | 3 - .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- extensions/pom.xml | 2 +- extensions/privacy-extension/pom.xml | 4 +- extensions/privacy-extension/rest/pom.xml | 8 +- extensions/privacy-extension/services/pom.xml | 8 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- extensions/router/pom.xml | 4 +- extensions/router/router-api/pom.xml | 2 +- extensions/router/router-core/pom.xml | 2 +- extensions/router/router-karaf-feature/pom.xml | 4 +- .../src/main/feature/feature.xml | 23 +- extensions/router/router-rest/pom.xml | 2 +- extensions/router/router-service/pom.xml | 2 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 26 +- extensions/salesforce-connector/actions/pom.xml | 6 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 4 +- .../salesforce-connector/karaf-kar/pom.xml | 12 +- .../karaf-kar/src/main/feature/feature.xml | 4 +- extensions/salesforce-connector/pom.xml | 2 +- extensions/salesforce-connector/rest/pom.xml | 8 +- .../salesforce-connector/services/pom.xml | 7 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- extensions/unomi-mailchimp/actions/pom.xml | 6 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 6 +- extensions/unomi-mailchimp/karaf-kar/pom.xml | 5 +- extensions/unomi-mailchimp/pom.xml | 5 +- extensions/unomi-mailchimp/rest/pom.xml | 5 +- extensions/unomi-mailchimp/services/pom.xml | 5 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- extensions/weather-update/core/pom.xml | 4 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- extensions/weather-update/karaf-kar/pom.xml | 6 +- .../karaf-kar/src/main/feature/feature.xml | 4 +- extensions/weather-update/pom.xml | 2 +- itests/pom.xml | 20 +- .../java/org/apache/unomi/itests/BaseIT.java | 18 +- kar/pom.xml | 46 ++- kar/src/main/feature/feature.xml | 3 +- lifecycle-watcher/pom.xml | 2 +- metrics/pom.xml | 10 +- .../unomi/metrics/commands/ListCommand.java | 4 +- package/pom.xml | 406 ++++++++++--------- .../src/main/resources/etc/custom.properties | 2 + .../resources/etc/org.apache.karaf.shell.cfg | 47 ++- .../resources/etc/org.ops4j.pax.logging.cfg | 109 +++-- .../src/main/resources/etc/startup.properties | 59 --- performance-tests/pom.xml | 2 +- .../unomi/performancetests/BasicTest.java | 3 +- persistence-elasticsearch/core/pom.xml | 8 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 1 + persistence-elasticsearch/pom.xml | 2 +- persistence-spi/pom.xml | 4 +- plugins/baseplugin/pom.xml | 6 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 20 +- plugins/hover-event/pom.xml | 4 +- plugins/mail/pom.xml | 4 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- plugins/optimization-test/pom.xml | 2 +- plugins/past-event/pom.xml | 6 +- plugins/pom.xml | 4 +- plugins/request/pom.xml | 10 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 6 +- plugins/tracked-event/pom.xml | 6 +- pom.xml | 70 +++- rest/pom.xml | 6 +- samples/login-integration/pom.xml | 4 +- samples/pom.xml | 2 +- samples/trainingplugin/pom.xml | 4 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- samples/tweet-button-plugin/pom.xml | 4 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- services/pom.xml | 13 +- .../services/services/SegmentServiceImpl.java | 33 -- .../resources/OSGI-INF/blueprint/blueprint.xml | 73 +++- .../versions/master/custom-extensions.md | 2 +- .../markdown/versions/master/twitter-sample.md | 2 +- tools/pom.xml | 2 +- tools/shell-commands/pom.xml | 4 +- .../shell/migration/utils/ConsoleUtils.java | 4 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- tools/shell-dev-commands/pom.xml | 12 +- .../shell/commands/ListCommandSupport.java | 4 +- wab/pom.xml | 6 +- .../org/apache/unomi/web/ClientServlet.java | 8 +- .../org/apache/unomi/web/ContextServlet.java | 8 +- .../unomi/web/EventsCollectorServlet.java | 8 +- .../java/org/apache/unomi/web/HttpUtils.java | 8 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 21 +- 113 files changed, 758 insertions(+), 650 deletions(-) ----------------------------------------------------------------------
