Repository: incubator-edgent Updated Branches: refs/heads/develop 572cde06e -> b43fc7325
- Updated some of the dependencies to more recent versions. Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/b43fc732 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/b43fc732 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/b43fc732 Branch: refs/heads/develop Commit: b43fc73251a5d07194a27cefdfe1f007b478d8f6 Parents: 572cde0 Author: Christofer Dutz <christofer.d...@c-ware.de> Authored: Wed Aug 1 17:40:03 2018 +0200 Committer: Christofer Dutz <christofer.d...@c-ware.de> Committed: Wed Aug 1 17:40:03 2018 +0200 ---------------------------------------------------------------------- api/execution/pom.xml | 1 - connectors/csv/pom.xml | 1 - connectors/jdbc/pom.xml | 2 +- connectors/kafka/pom.xml | 4 ++-- connectors/websocket-jetty/pom.xml | 2 +- connectors/websocket-server/pom.xml | 2 +- platforms/android/android/hardware/pom.xml | 11 +++++++++++ platforms/android/android/topology/pom.xml | 11 +++++++++++ platforms/android/api/execution/pom.xml | 1 - platforms/android/connectors/csv/pom.xml | 1 - platforms/android/connectors/kafka/pom.xml | 4 ++-- platforms/android/pom.xml | 2 +- platforms/java7/api/execution/pom.xml | 1 - platforms/java7/connectors/csv/pom.xml | 1 - platforms/java7/connectors/kafka/pom.xml | 4 ++-- platforms/java7/pom.xml | 2 +- pom.xml | 23 +++++++++++++++++++---- 17 files changed, 52 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/api/execution/pom.xml ---------------------------------------------------------------------- diff --git a/api/execution/pom.xml b/api/execution/pom.xml index 0502503..50ff3a3 100644 --- a/api/execution/pom.xml +++ b/api/execution/pom.xml @@ -43,7 +43,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/connectors/csv/pom.xml ---------------------------------------------------------------------- diff --git a/connectors/csv/pom.xml b/connectors/csv/pom.xml index 2723b5c..899b5d1 100644 --- a/connectors/csv/pom.xml +++ b/connectors/csv/pom.xml @@ -34,7 +34,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/connectors/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml index 5e7ca2b..b2f1644 100644 --- a/connectors/jdbc/pom.xml +++ b/connectors/jdbc/pom.xml @@ -103,7 +103,7 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.13.1.1</version> + <version>10.14.2.0</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/connectors/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/connectors/kafka/pom.xml b/connectors/kafka/pom.xml index 51c34a0..8a2aee2 100644 --- a/connectors/kafka/pom.xml +++ b/connectors/kafka/pom.xml @@ -100,7 +100,7 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.10.4</version> + <version>2.10.7</version> <exclusions> <exclusion> <!-- not transitive --> <groupId>*</groupId> @@ -122,7 +122,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.6</version> + <version>3.4.13</version> <exclusions> <exclusion> <!-- not transitive --> <groupId>*</groupId> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/connectors/websocket-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/connectors/websocket-jetty/pom.xml b/connectors/websocket-jetty/pom.xml index eb3df35..57aa13f 100644 --- a/connectors/websocket-jetty/pom.xml +++ b/connectors/websocket-jetty/pom.xml @@ -43,7 +43,7 @@ <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-client-impl</artifactId> - <version>9.3.6.v20151106</version> + <version>9.4.8.v20180619</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/connectors/websocket-server/pom.xml ---------------------------------------------------------------------- diff --git a/connectors/websocket-server/pom.xml b/connectors/websocket-server/pom.xml index 50f6e73..9cb92b4 100644 --- a/connectors/websocket-server/pom.xml +++ b/connectors/websocket-server/pom.xml @@ -43,7 +43,7 @@ <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-server-impl</artifactId> - <version>9.3.6.v20151106</version> + <version>9.4.8.v20180619</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/android/android/hardware/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml index afcd62d..c832ccb 100644 --- a/platforms/android/android/hardware/pom.xml +++ b/platforms/android/android/hardware/pom.xml @@ -48,4 +48,15 @@ </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <!-- The default version pulled in by the android dependency has vulnerabilities --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.5</version> + </dependency> + </dependencies> + </dependencyManagement> + </project> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/android/android/topology/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml index 2739efe..0a54f06 100644 --- a/platforms/android/android/topology/pom.xml +++ b/platforms/android/android/topology/pom.xml @@ -53,4 +53,15 @@ </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <!-- The default version pulled in by the android dependency has vulnerabilities --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.5</version> + </dependency> + </dependencies> + </dependencyManagement> + </project> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/android/api/execution/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/api/execution/pom.xml b/platforms/android/api/execution/pom.xml index 113dadd..578b824 100644 --- a/platforms/android/api/execution/pom.xml +++ b/platforms/android/api/execution/pom.xml @@ -72,7 +72,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/android/connectors/csv/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/connectors/csv/pom.xml b/platforms/android/connectors/csv/pom.xml index 1b2cb14..79aceac 100644 --- a/platforms/android/connectors/csv/pom.xml +++ b/platforms/android/connectors/csv/pom.xml @@ -63,7 +63,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/android/connectors/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/connectors/kafka/pom.xml b/platforms/android/connectors/kafka/pom.xml index 8473f4a..2aa3e6c 100644 --- a/platforms/android/connectors/kafka/pom.xml +++ b/platforms/android/connectors/kafka/pom.xml @@ -130,7 +130,7 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.10.4</version> + <version>2.10.7</version> <exclusions> <exclusion> <!-- not transitive --> <groupId>*</groupId> @@ -152,7 +152,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.6</version> + <version>3.4.13</version> <exclusions> <exclusion> <!-- not transitive --> <groupId>*</groupId> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/android/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/pom.xml b/platforms/android/pom.xml index 57171dd..f52d006 100644 --- a/platforms/android/pom.xml +++ b/platforms/android/pom.xml @@ -57,7 +57,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> + <version>1.16</version> <executions> <execution> <id>check-jdk-signatures</id> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/java7/api/execution/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/api/execution/pom.xml b/platforms/java7/api/execution/pom.xml index 880d89f..5d98c60 100644 --- a/platforms/java7/api/execution/pom.xml +++ b/platforms/java7/api/execution/pom.xml @@ -91,7 +91,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/java7/connectors/csv/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/connectors/csv/pom.xml b/platforms/java7/connectors/csv/pom.xml index c45d83b..d86314f 100644 --- a/platforms/java7/connectors/csv/pom.xml +++ b/platforms/java7/connectors/csv/pom.xml @@ -82,7 +82,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/java7/connectors/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/connectors/kafka/pom.xml b/platforms/java7/connectors/kafka/pom.xml index 94823ef..36d841f 100644 --- a/platforms/java7/connectors/kafka/pom.xml +++ b/platforms/java7/connectors/kafka/pom.xml @@ -149,7 +149,7 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.10.4</version> + <version>2.10.7</version> <exclusions> <exclusion> <!-- not transitive --> <groupId>*</groupId> @@ -171,7 +171,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.6</version> + <version>3.4.13</version> <exclusions> <exclusion> <!-- not transitive --> <groupId>*</groupId> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/platforms/java7/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml index bcd7b7c..c73e170 100644 --- a/platforms/java7/pom.xml +++ b/platforms/java7/pom.xml @@ -91,7 +91,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> + <version>1.16</version> <executions> <execution> <id>check-jdk-signatures</id> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b43fc732/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6450e14..b730b5e 100644 --- a/pom.xml +++ b/pom.xml @@ -51,9 +51,9 @@ <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding> <maven.version>3.3.1</maven.version> - <jetty.version>9.3.6.v20151106</jetty.version> + <jetty.version>9.4.8.v20180619</jetty.version> <gson.version>2.2.4</gson.version> - <slf4j.version>1.7.12</slf4j.version> + <slf4j.version>1.7.25</slf4j.version> <!-- URL of the ASF SonarQube server --> <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url> @@ -637,7 +637,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> + <version>1.16</version> <executions> <execution> <id>check-jdk-signatures</id> @@ -870,7 +870,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>3.1.2</version> + <version>3.2.6</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -893,6 +893,21 @@ </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.8.5</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> + </dependencies> + </dependencyManagement> + <repositories> <repository> <id>apache-release</id>
