Repository: incubator-unomi Updated Branches: refs/heads/master ab958be9e -> 780c6cd9b
UNOMI-19 Rationalize dependencies management This commit regroups all the dependencies versions using Maven's dependency management with two exceptions : - the request plugin that has its own (specific) dependencies, those weren't moved - the ElasticSearch persistence implementation that uses different versions of some librairies (such as Apache HttpComponents) so these were also left in place. Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/780c6cd9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/780c6cd9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/780c6cd9 Branch: refs/heads/master Commit: 780c6cd9b6797dba96e89732abc494c5662d2745 Parents: ab958be Author: Serge Huber <[email protected]> Authored: Mon Jul 25 14:02:50 2016 +0200 Committer: Serge Huber <[email protected]> Committed: Mon Jul 25 14:02:50 2016 +0200 ---------------------------------------------------------------------- api/pom.xml | 1 - extensions/geonames/pom.xml | 1 - extensions/geonames/rest/pom.xml | 7 - extensions/geonames/services/pom.xml | 4 - extensions/lists-extension/rest/pom.xml | 7 - extensions/lists-extension/services/pom.xml | 1 - extensions/privacy-extension/rest/pom.xml | 7 - extensions/privacy-extension/services/pom.xml | 1 - itests/pom.xml | 14 - kar/pom.xml | 3 - package/pom.xml | 7 - performance-tests/pom.xml | 31 -- persistence-elasticsearch/core/pom.xml | 5 - .../plugins/security/pom.xml | 2 - persistence-elasticsearch/pom.xml | 3 - persistence-spi/pom.xml | 5 - plugins/baseplugin/pom.xml | 7 - plugins/mail/pom.xml | 2 - plugins/request/pom.xml | 2 - pom.xml | 374 ++++++++++++++++++- rest/pom.xml | 9 - samples/tweet-button-plugin/pom.xml | 1 - services/pom.xml | 15 - wab/pom.xml | 17 +- 24 files changed, 376 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index bbb7917..aae2df9 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -34,7 +34,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> <configuration> <tags> <tag> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/extensions/geonames/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml index 6220d60..31dcfae 100644 --- a/extensions/geonames/pom.xml +++ b/extensions/geonames/pom.xml @@ -33,6 +33,5 @@ <artifactId>cxs-geonames</artifactId> <name>Apache Unomi :: Extensions :: Geonames Database</name> <description>Apache Unomi Context Server extension that integrates with the Geonames database</description> - <version>1.1.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> </project> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/extensions/geonames/rest/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml index 6441fe8..4a35441 100644 --- a/extensions/geonames/rest/pom.xml +++ b/extensions/geonames/rest/pom.xml @@ -47,43 +47,36 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-core</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.0</version> </dependency> <dependency> <groupId>org.apache.unomi</groupId> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/extensions/geonames/services/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml index 039c328..8a43483 100644 --- a/extensions/geonames/services/pom.xml +++ b/extensions/geonames/services/pom.xml @@ -47,23 +47,19 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>2.7.11</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/extensions/lists-extension/rest/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml index ca7e9a1..90da5da 100644 --- a/extensions/lists-extension/rest/pom.xml +++ b/extensions/lists-extension/rest/pom.xml @@ -48,43 +48,36 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-core</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.0</version> </dependency> <dependency> <groupId>org.apache.unomi</groupId> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/extensions/lists-extension/services/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml index 90abe56..1a3765c 100644 --- a/extensions/lists-extension/services/pom.xml +++ b/extensions/lists-extension/services/pom.xml @@ -47,7 +47,6 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>2.7.11</version> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/extensions/privacy-extension/rest/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml index 43fb35e..a3ae494 100644 --- a/extensions/privacy-extension/rest/pom.xml +++ b/extensions/privacy-extension/rest/pom.xml @@ -47,43 +47,36 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-core</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.0</version> </dependency> <dependency> <groupId>org.apache.unomi</groupId> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/extensions/privacy-extension/services/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml index 503b7c0..9fad09c 100644 --- a/extensions/privacy-extension/services/pom.xml +++ b/extensions/privacy-extension/services/pom.xml @@ -46,7 +46,6 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>2.7.11</version> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 5163f2a..b156a45 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -50,78 +50,66 @@ <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>standard</artifactId> - <version>${version.karaf}</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-features</artifactId> - <version>3.1.0</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.apache.cxf.karaf</groupId> <artifactId>apache-cxf</artifactId> - <version>${cxf.version}</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.6</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> - <version>4.3.6</version> <type>bundle</type> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-osgi</artifactId> - <version>4.3.3</version> </dependency> <!-- Dependencies for pax exam karaf container --> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-karaf</artifactId> - <version>${version.pax.exam}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${version.pax.exam}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${version.pax.exam}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>1.6.0</version> <scope>test</scope> </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> @@ -133,7 +121,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> <id>generate-depends-file</id> @@ -146,7 +133,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.18.1</version> <configuration> <includes> <include>**/*AllTests.java</include> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/kar/pom.xml ---------------------------------------------------------------------- diff --git a/kar/pom.xml b/kar/pom.xml index 9bdbcb8..1fd7b0f 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -103,12 +103,10 @@ <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.jakarta-regexp</artifactId> - <version>1.4_1</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.joda-time</artifactId> - <version>2.3_1</version> </dependency> </dependencies> @@ -118,7 +116,6 @@ <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> - <version>3.0.2</version> <extensions>true</extensions> <configuration> <includeTransitiveDependency>false</includeTransitiveDependency> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/package/pom.xml ---------------------------------------------------------------------- diff --git a/package/pom.xml b/package/pom.xml index 825118d..29ef8a6 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -39,7 +39,6 @@ <!-- scope is compile so all features (there is only one) are installed into startup.properties and the feature repo itself is not installed --> <groupId>org.apache.karaf.features</groupId> <artifactId>framework</artifactId> - <version>${version.karaf}</version> <type>kar</type> </dependency> <dependency> @@ -47,7 +46,6 @@ <groupId>org.apache.karaf.features</groupId> <artifactId>standard</artifactId> <classifier>features</classifier> - <version>${version.karaf}</version> <type>xml</type> <scope>runtime</scope> </dependency> @@ -55,7 +53,6 @@ <groupId>org.apache.karaf.features</groupId> <artifactId>spring</artifactId> <classifier>features</classifier> - <version>${version.karaf}</version> <type>xml</type> <scope>runtime</scope> </dependency> @@ -63,7 +60,6 @@ <groupId>org.apache.karaf.features</groupId> <artifactId>enterprise</artifactId> <classifier>features</classifier> - <version>${version.karaf}</version> <type>xml</type> <scope>runtime</scope> </dependency> @@ -72,7 +68,6 @@ <!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration --> <groupId>org.apache.cxf.karaf</groupId> <artifactId>apache-cxf</artifactId> - <version>${cxf.version}</version> <classifier>features</classifier> <type>xml</type> <scope>runtime</scope> @@ -125,7 +120,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> <executions> <execution> <id>unpack-sigar</id> @@ -229,7 +223,6 @@ <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> - <version>3.0.2</version> <executions> <execution> <id>install-kar</id> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/performance-tests/pom.xml ---------------------------------------------------------------------- diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml index fb90b56..2b51dec 100644 --- a/performance-tests/pom.xml +++ b/performance-tests/pom.xml @@ -26,16 +26,6 @@ <name>Apache Unomi :: Performance Tests</name> <description>Apache Unomi Context Server performance tests</description> - <properties> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> - <scala.version>2.11.4</scala.version> - <encoding>UTF-8</encoding> - - <gatling.version>2.1.2</gatling.version> - <scala-maven-plugin.version>3.2.0</scala-maven-plugin.version> - </properties> - <dependencies> <dependency> <groupId>org.apache.unomi</groupId> @@ -46,35 +36,30 @@ <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>standard</artifactId> - <version>3.0.2</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-features</artifactId> - <version>3.1.0</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>enterprise</artifactId> - <version>3.0.2</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>spring</artifactId> - <version>3.0.2</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.apache.cxf.karaf</groupId> <artifactId>apache-cxf</artifactId> - <version>${cxf.version}</version> <classifier>features</classifier> <type>xml</type> </dependency> @@ -88,91 +73,76 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.6</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> - <version>4.3.5</version> <type>bundle</type> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-osgi</artifactId> - <version>4.3.2</version> </dependency> <!-- Dependencies for pax exam karaf container --> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-karaf</artifactId> - <version>${version.pax.exam}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> - <version>${version.pax.exam}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> - <version>${version.pax.exam}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>1.6.0</version> <scope>test</scope> </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>com.carrotsearch</groupId> <artifactId>junit-benchmarks</artifactId> - <version>0.7.2</version> <scope>test</scope> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.181</version> <scope>test</scope> </dependency> <dependency> <groupId>io.gatling</groupId> <artifactId>gatling-app</artifactId> - <version>${gatling.version}</version> </dependency> <dependency> <groupId>io.gatling</groupId> <artifactId>gatling-recorder</artifactId> - <version>${gatling.version}</version> </dependency> <dependency> <groupId>io.gatling.highcharts</groupId> <artifactId>gatling-charts-highcharts</artifactId> - <version>${gatling.version}</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>${scala.version}</version> </dependency> </dependencies> @@ -192,7 +162,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> <id>generate-depends-file</id> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/persistence-elasticsearch/core/pom.xml ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml index ee121af..eddadf1 100644 --- a/persistence-elasticsearch/core/pom.xml +++ b/persistence-elasticsearch/core/pom.xml @@ -33,7 +33,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>4.3.1</version> <scope>provided</scope> </dependency> @@ -147,24 +146,20 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${version.jackson.core}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> <dependency> <groupId>org.mvel</groupId> <artifactId>mvel2</artifactId> - <version>2.1.9.Final</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/persistence-elasticsearch/plugins/security/pom.xml ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml index a923b3e..3158c80 100644 --- a/persistence-elasticsearch/plugins/security/pom.xml +++ b/persistence-elasticsearch/plugins/security/pom.xml @@ -64,7 +64,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> <executions> <execution> <id>attach-sources</id> @@ -76,7 +75,6 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.3</version> <configuration> <appendAssemblyId>false</appendAssemblyId> <outputDirectory>${project.build.directory}/releases/</outputDirectory> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/persistence-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml index 2465b03..cf7a403 100644 --- a/persistence-elasticsearch/pom.xml +++ b/persistence-elasticsearch/pom.xml @@ -29,9 +29,6 @@ <description>ElasticSearch persistence implementation for the Apache Unomi Context Server</description> <packaging>pom</packaging> - <properties> - </properties> - <modules> <module>core</module> <module>plugins</module> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/persistence-spi/pom.xml ---------------------------------------------------------------------- diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml index ad1f152..0b14515 100644 --- a/persistence-spi/pom.xml +++ b/persistence-spi/pom.xml @@ -39,30 +39,25 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${version.jackson.core}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${version.jackson.core}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>${version.jackson.jaxb}</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/plugins/baseplugin/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml index f68a795..61e4a76 100644 --- a/plugins/baseplugin/pom.xml +++ b/plugins/baseplugin/pom.xml @@ -33,28 +33,23 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.joda-time</artifactId> - <version>2.3_1</version> <scope>provided</scope> </dependency> <dependency> @@ -72,12 +67,10 @@ <dependency> <groupId>ognl</groupId> <artifactId>ognl</artifactId> - <version>3.0.11</version> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.11.0.GA</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/plugins/mail/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml index 1dd6ce3..2a7d61e 100644 --- a/plugins/mail/pom.xml +++ b/plugins/mail/pom.xml @@ -33,12 +33,10 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.3.3</version> </dependency> <dependency> <groupId>org.antlr</groupId> <artifactId>ST4</artifactId> - <version>4.0.8</version> <classifier>complete</classifier> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/plugins/request/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml index 07dff40..043b430 100644 --- a/plugins/request/pom.xml +++ b/plugins/request/pom.xml @@ -33,14 +33,12 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish</groupId> <artifactId>javax.json</artifactId> - <version>1.0.4</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ef5ad8f..ee247f6 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,14 @@ <version.karaf>3.0.2</version.karaf> <version.pax.exam>4.4.0</version.pax.exam> <elasticsearch.version>1.6.2</elasticsearch.version> + + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + <scala.version>2.11.4</scala.version> + <encoding>UTF-8</encoding> + + <gatling.version>2.1.2</gatling.version> + <scala-maven-plugin.version>3.2.0</scala-maven-plugin.version> </properties> <mailingLists> @@ -487,6 +495,328 @@ </profile> </profiles> + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>4.3.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>4.3.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + </dependency> + + <!-- Apache CXF dependencies --> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-core</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-security-cors</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration --> + <groupId>org.apache.cxf.karaf</groupId> + <artifactId>apache-cxf</artifactId> + <version>${cxf.version}</version> + <classifier>features</classifier> + <type>xml</type> + <scope>runtime</scope> + </dependency> + <!-- End of Apache CXF dependencies --> + + <!-- Jackson dependencies --> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>${version.jackson.core}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${version.jackson.core}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${version.jackson.core}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${version.jackson.jaxb}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${version.jackson.core}</version> + <scope>provided</scope> + </dependency> + <!-- End of Jackson dependencies --> + + <!-- Apache Commons dependencies --> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.3.3</version> + </dependency> + <!-- End of Apache Commons dependencies --> + + <!-- Apache Karaf dependencies --> + <dependency> + <!-- scope is compile so all features (there is only one) are installed into startup.properties and the feature repo itself is not installed --> + <groupId>org.apache.karaf.features</groupId> + <artifactId>framework</artifactId> + <version>${version.karaf}</version> + <type>kar</type> + </dependency> + <dependency> + <!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration --> + <groupId>org.apache.karaf.features</groupId> + <artifactId>standard</artifactId> + <classifier>features</classifier> + <version>${version.karaf}</version> + <type>xml</type> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.karaf.features</groupId> + <artifactId>spring</artifactId> + <classifier>features</classifier> + <version>${version.karaf}</version> + <type>xml</type> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.karaf.features</groupId> + <artifactId>enterprise</artifactId> + <classifier>features</classifier> + <version>${version.karaf}</version> + <type>xml</type> + <scope>runtime</scope> + </dependency> + <!-- End of Apache Karaf dependencies --> + + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-features</artifactId> + <version>3.1.0</version> + <classifier>features</classifier> + <type>xml</type> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.6</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>4.3.6</version> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> + <version>4.3.3</version> + </dependency> + + <!-- Dependencies for pax exam karaf container --> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-karaf</artifactId> + <version>${version.pax.exam}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <version>${version.pax.exam}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam</artifactId> + <version>${version.pax.exam}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-aether</artifactId> + <version>1.6.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.carrotsearch</groupId> + <artifactId>junit-benchmarks</artifactId> + <version>0.7.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.4.181</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>io.gatling</groupId> + <artifactId>gatling-app</artifactId> + <version>${gatling.version}</version> + </dependency> + <dependency> + <groupId>io.gatling</groupId> + <artifactId>gatling-recorder</artifactId> + <version>${gatling.version}</version> + </dependency> + <dependency> + <groupId>io.gatling.highcharts</groupId> + <artifactId>gatling-charts-highcharts</artifactId> + <version>${gatling.version}</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.jakarta-regexp</artifactId> + <version>1.4_1</version> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.joda-time</artifactId> + <version>2.3_1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>ognl</groupId> + <artifactId>ognl</artifactId> + <version>3.0.11</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.11.0.GA</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>ST4</artifactId> + <version>4.0.8</version> + <classifier>complete</classifier> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + <version>1.0.4</version> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_1.0_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> + <version>1.0.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.mvel</groupId> + <artifactId>mvel2</artifactId> + <version>2.1.9.Final</version> + </dependency> + + </dependencies> + </dependencyManagement> + <modules> <module>api</module> <module>persistence-spi</module> @@ -516,7 +846,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.5.3</version> + <version>3.2.0</version> <configuration> <instructions> <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> @@ -540,6 +870,48 @@ <artifactId>build-helper-maven-plugin</artifactId> <version>1.10</version> </plugin> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <version>${version.karaf}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + </plugin> + <plugin> + <groupId>org.apache.servicemix.tooling</groupId> + <artifactId>depends-maven-plugin</artifactId> + <version>1.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.18.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + </plugin> </plugins> </pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/rest/pom.xml ---------------------------------------------------------------------- diff --git a/rest/pom.xml b/rest/pom.xml index d246bc8..09aebca 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -53,50 +53,42 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>4.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-core</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.0</version> </dependency> <dependency> <groupId>org.apache.unomi</groupId> @@ -233,7 +225,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> <configuration> <tags> <tag> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/samples/tweet-button-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml index b540d1b..b3834d8 100644 --- a/samples/tweet-button-plugin/pom.xml +++ b/samples/tweet-button-plugin/pom.xml @@ -43,7 +43,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.0.1</version> <extensions>true</extensions> <configuration> <instructions> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/services/pom.xml ---------------------------------------------------------------------- diff --git a/services/pom.xml b/services/pom.xml index 024b261..51f5999 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -40,14 +40,12 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>4.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> - <version>4.3.1</version> <scope>provided</scope> </dependency> @@ -61,81 +59,68 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-core</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.mvel</groupId> <artifactId>mvel2</artifactId> - <version>2.1.9.Final</version> </dependency> <dependency> <groupId>org.glassfish</groupId> <artifactId>javax.json</artifactId> - <version>1.0.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${version.jackson.core}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${version.jackson.core}</version> <scope>provided</scope> </dependency> <!-- also need JAXB annotation support --> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>${version.jackson.jaxb}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/780c6cd9/wab/pom.xml ---------------------------------------------------------------------- diff --git a/wab/pom.xml b/wab/pom.xml index 4594165..2eee85c 100644 --- a/wab/pom.xml +++ b/wab/pom.xml @@ -33,13 +33,11 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> </dependency> <dependency> <groupId>org.apache.unomi</groupId> @@ -57,56 +55,47 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jcdi_1.0_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-annotation_1.1_spec</artifactId> - <version>1.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${version.jackson.core}</version> - <scope>provided</scope> + <scope>provided</scope> </dependency> <!-- Builds on core streaming API; also needs core annotations --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>${version.jackson.core}</version> - <scope>provided</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${version.jackson.core}</version> - <scope>provided</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-api</artifactId> - <version>3.1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish</groupId> <artifactId>javax.json</artifactId> - <version>1.0.4</version> </dependency> - </dependencies> <build>
