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/10/26 22:51:41 UTC

[incubator-plc4x] 01/02: - Fixed some version related problems (Made sure they can't reoccur)

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 567040120184fb46f4b56f763c58f7e74ab8b8c1
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sat Oct 27 00:50:34 2018 +0200

    - Fixed some version related problems (Made sure they can't reoccur)
---
 plc4j/utils/opm/pom.xml | 9 +++++----
 pom.xml                 | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plc4j/utils/opm/pom.xml b/plc4j/utils/opm/pom.xml
index 500820c..383d5ef 100644
--- a/plc4j/utils/opm/pom.xml
+++ b/plc4j/utils/opm/pom.xml
@@ -20,14 +20,15 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          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>plc4j-utils</artifactId>
     <groupId>org.apache.plc4x</groupId>
     <version>0.2.0-SNAPSHOT</version>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-
   <artifactId>plc4j-opm</artifactId>
   <packaging>jar</packaging>
 
@@ -39,12 +40,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>${project.version}</version>
+      <version>0.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-core</artifactId>
-      <version>${project.version}</version>
+      <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
diff --git a/pom.xml b/pom.xml
index 749d7bb..6b860ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,7 @@
                 <requireJavaVersion>
                   <version>1.8.0</version>
                 </requireJavaVersion>
+                <reactorModuleConvergence/>
                 <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" />
               </rules>
             </configuration>