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 2019/08/13 16:26:42 UTC
[plc4x] branch develop updated: - Fix dependencyVersion problems
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new f9163eb - Fix dependencyVersion problems
f9163eb is described below
commit f9163ebf6ef21589d820a0119195c451edbc4450
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Aug 13 18:26:34 2019 +0200
- Fix dependencyVersion problems
---
plc4j/examples/hello-cloud-azure/pom.xml | 16 +++++++
plc4j/examples/hello-connectivity-kafka/pom.xml | 32 ++++++++++----
plc4j/examples/pom.xml | 8 ++++
plc4j/integrations/apache-karaf/pom.xml | 19 ++++++++
plc4j/protocols/delta-v/pom.xml | 5 +++
pom.xml | 59 ++++++++++++++++---------
6 files changed, 109 insertions(+), 30 deletions(-)
diff --git a/plc4j/examples/hello-cloud-azure/pom.xml b/plc4j/examples/hello-cloud-azure/pom.xml
index 0d1b67a..9b8cd29 100644
--- a/plc4j/examples/hello-cloud-azure/pom.xml
+++ b/plc4j/examples/hello-cloud-azure/pom.xml
@@ -69,6 +69,22 @@
<version>2.9.7</version>
</dependency>
<dependency>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jnr-ffi</artifactId>
+ <version>2.1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jffi</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jffi</artifactId>
+ <version>1.2.17</version>
+ <classifier>native</classifier>
+ </dependency>
+ <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15on</artifactId>
<version>1.60</version>
diff --git a/plc4j/examples/hello-connectivity-kafka/pom.xml b/plc4j/examples/hello-connectivity-kafka/pom.xml
index 90da644..315802c 100644
--- a/plc4j/examples/hello-connectivity-kafka/pom.xml
+++ b/plc4j/examples/hello-connectivity-kafka/pom.xml
@@ -110,10 +110,24 @@
</dependency>
</dependencies>
- <!-- TODO: Can be removed as soon as Edgent is released in a version 1.3.0 -->
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.101tec</groupId>
+ <artifactId>zkclient</artifactId>
+ <version>0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.10</artifactId>
<version>0.10.2.2</version>
@@ -124,19 +138,19 @@
<version>0.10.2.2</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.10.7</version>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.13</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.10.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.25</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index f9cf89e..36340f9 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -66,6 +66,14 @@
<build>
<plugins>
+ <!-- This is just examples including these checks here requires an insane amount of housekeeping. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
diff --git a/plc4j/integrations/apache-karaf/pom.xml b/plc4j/integrations/apache-karaf/pom.xml
index 02015f8..556b454 100644
--- a/plc4j/integrations/apache-karaf/pom.xml
+++ b/plc4j/integrations/apache-karaf/pom.xml
@@ -50,6 +50,25 @@
</modules>
<build>
+ <plugins>
+ <!-- With OSGI there's a lot of stuff with duplicate classes in different versions -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-ban-duplicate-classes</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
diff --git a/plc4j/protocols/delta-v/pom.xml b/plc4j/protocols/delta-v/pom.xml
index e31ed8a..984a4ae 100644
--- a/plc4j/protocols/delta-v/pom.xml
+++ b/plc4j/protocols/delta-v/pom.xml
@@ -91,6 +91,11 @@
<artifactId>okhttp</artifactId>
<version>3.13.1</version>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>1.17.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 213becc..ab6cfea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
<commons-io.version>2.6</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.7</commons-lang3.version>
+ <commons-logging.version>1.2</commons-logging.version>
<commons-math3.version>3.5</commons-math3.version>
<commons-pool2.version>2.6.0</commons-pool2.version>
<commons-text.version>1.6</commons-text.version>
@@ -271,6 +272,11 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.dropwizard</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics-core.version}</version>
@@ -316,6 +322,11 @@
<version>${netty.version}</version>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ <dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.6</version>
@@ -555,6 +566,11 @@
<version>${groovy.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.1</version>
@@ -1640,44 +1656,45 @@
<requireJavaVersion>
<version>1.8.0</version>
</requireJavaVersion>
- <!--reactorModuleConvergence/-->
</rules>
</configuration>
</execution>
<!-- Ensure we're not mixing dependency versions -->
<execution>
<id>enforce-version-convergence</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
<configuration>
<rules>
<dependencyConvergence/>
</rules>
</configuration>
- <goals>
- <goal>enforce</goal>
- </goals>
</execution>
<!--
Fails the build if classes are included from multiple
artifacts and these are not identical.
-->
<execution>
- <id>enforce-ban-duplicate-classes</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <banDuplicateClasses>
- <scopes>
- <scope>compile</scope>
- <scope>provided</scope>
- </scopes>
- <findAllDuplicates>true</findAllDuplicates>
- <ignoreWhenIdentical>true</ignoreWhenIdentical>
- </banDuplicateClasses>
- </rules>
- <fail>true</fail>
- </configuration>
+ <id>enforce-ban-duplicate-classes</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <banDuplicateClasses>
+ <scopes>
+ <scope>compile</scope>
+ <scope>provided</scope>
+ </scopes>
+ <findAllDuplicates>true</findAllDuplicates>
+ <ignoreWhenIdentical>true</ignoreWhenIdentical>
+ </banDuplicateClasses>
+ </rules>
+ <fail>true</fail>
+ </configuration>
</execution>
</executions>
<dependencies>