You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/09/06 21:09:21 UTC
[incubator-plc4x] 02/03: - Fixed some cve related problems -
Commented out an eventually unused dependency
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 511f6a891535af475d288fad6114aa73a4ef2fbd
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Sep 6 23:08:25 2018 +0200
- Fixed some cve related problems
- Commented out an eventually unused dependency
---
examples/google/pom.xml | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/examples/google/pom.xml b/examples/google/pom.xml
index 173c7f2..3d57d43 100644
--- a/examples/google/pom.xml
+++ b/examples/google/pom.xml
@@ -20,12 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>examples</artifactId>
<groupId>org.apache.plc4x.examples</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>google</artifactId>
<name>Examples: Google Cloud IoT Core</name>
@@ -34,15 +35,15 @@
a PLC and making that available in an the Google Cloud IoT Core.
</description>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
- <usedDependencies>
+ <usedDependencies combine.children="append">
<usedDependency>org.apache.plc4x:plc4j-protocol-s7</usedDependency>
+ <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
</usedDependencies>
</configuration>
</plugin>
@@ -90,11 +91,11 @@
<version>1.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.beam/beam-runners-google-cloud-dataflow-java -->
- <dependency>
+ <!--dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-google-cloud-dataflow-java</artifactId>
<version>2.6.0</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
@@ -113,6 +114,16 @@
<artifactId>proton-j</artifactId>
<version>0.18.0</version>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>2.7.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.6</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
\ No newline at end of file