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/06/19 13:28:16 UTC

[plc4x] branch develop updated: - Cleaned up the profile names - Cleaned up the version definitions to be more in-line with the other modules.

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 0a03ada  - Cleaned up the profile names - Cleaned up the version definitions to be more in-line with the other modules.
0a03ada is described below

commit 0a03ada5da1b481929588f7815c13c50ca35dc66
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Jun 19 15:28:09 2019 +0200

    - Cleaned up the profile names
    - Cleaned up the version definitions to be more in-line with the other modules.
---
 pom.xml                                            | 60 +++++++++++++++++++---
 sandbox/code-generation/driver-base-java/pom.xml   |  2 -
 .../language-base-freemarker/pom.xml               |  4 --
 sandbox/code-generation/language-java/pom.xml      |  5 +-
 .../code-generation/protocol-base-mspec/pom.xml    |  6 +--
 sandbox/code-generation/protocol-s7/pom.xml        |  8 +--
 .../code-generation/test-java-s7-driver/pom.xml    | 12 ++---
 7 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 602efc6..0ffce9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,9 @@
     <!-- Exclude all generated code -->
     <sonar.exclusions>**/generated-sources</sonar.exclusions>
 
+
+    <plc4x-code-generation.version>1.0.0-SNAPSHOT</plc4x-code-generation.version>
+
     <antlr.version>4.7.2</antlr.version>
     <asm.version>5.0.4</asm.version>
     <assertj.version>3.11.1</assertj.version>
@@ -110,7 +113,7 @@
     <boost.version.underline-short>1_70</boost.version.underline-short>
     <boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
     <byte-buddy.version>1.9.10</byte-buddy.version>
-    <commons-codec.version>1.11</commons-codec.version>
+    <commons-codec.version>1.12</commons-codec.version>
     <commons-collections4.version>4.1</commons-collections4.version>
     <commons-configuration2.version>2.2</commons-configuration2.version>
     <commons-io.version>2.6</commons-io.version>
@@ -118,12 +121,13 @@
     <commons-lang3.version>3.7</commons-lang3.version>
     <commons-math3.version>3.5</commons-math3.version>
     <commons-pool2.version>2.6.0</commons-pool2.version>
-    <commons-text.version>1.4</commons-text.version>
+    <commons-text.version>1.6</commons-text.version>
     <crc.version>1.0.1</crc.version>
     <daffodil.version>2.3.0</daffodil.version>
     <elasticsearch.version>7.0.1</elasticsearch.version>
     <equalsverifier.version>3.0.2</equalsverifier.version>
     <findbugs.version>3.0.1</findbugs.version>
+    <freemarker.version>2.3.28</freemarker.version>
     <groovy.version>2.5.3</groovy.version>
     <gson.version>2.8.0</gson.version>
     <guava.version>27.0.1-jre</guava.version>
@@ -344,6 +348,11 @@
         <version>${equalsverifier.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr4-runtime</artifactId>
+        <version>${antlr.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-collections4</artifactId>
         <version>${commons-collections4.version}</version>
@@ -501,6 +510,16 @@
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-code-generation-language-base</artifactId>
+        <version>${plc4x-code-generation.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x.plugins</groupId>
+        <artifactId>plc4x-code-generation-protocol-base</artifactId>
+        <version>${plc4x-code-generation.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
         <version>${assertj.version}</version>
@@ -548,6 +567,16 @@
         <version>${elasticsearch.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.freemarker</groupId>
+        <artifactId>freemarker</artifactId>
+        <version>${freemarker.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.jinahya</groupId>
+        <artifactId>bit-io</artifactId>
+        <version>1.4.2</version>
+      </dependency>
+      <dependency>
         <groupId>com.github.snksoft</groupId>
         <artifactId>crc</artifactId>
         <version>${crc.version}</version>
@@ -1041,6 +1070,18 @@
         </plugin>
 
         <plugin>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-maven-plugin</artifactId>
+          <version>${antlr.version}</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.plc4x.plugins</groupId>
+          <artifactId>plc4x-maven-plugin</artifactId>
+          <version>${plc4x-code-generation.version}</version>
+        </plugin>
+
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>buildnumber-maven-plugin</artifactId>
           <version>1.4</version>
@@ -1394,9 +1435,9 @@
       <id>with-proxies</id>
     </profile>
 
-    <!-- Profile for linux -->
+    <!-- Profile for linux (Self-Enabling) -->
     <profile>
-      <id>unix</id>
+      <id>os-unix</id>
       <activation>
         <os>
           <family>unix</family>
@@ -1415,9 +1456,9 @@
         <thrift.compiler.executable>thrift</thrift.compiler.executable>
       </properties>
     </profile>
-    <!-- Profile for mac -->
+    <!-- Profile for mac (Self-Enabling) -->
     <profile>
-      <id>max</id>
+      <id>os-mac</id>
       <activation>
         <os>
           <family>mac</family>
@@ -1436,9 +1477,9 @@
         <thrift.compiler.executable>thrift</thrift.compiler.executable>
       </properties>
     </profile>
-    <!-- profile for windows -->
+    <!-- profile for windows (Self-Enabling) -->
     <profile>
-      <id>windows</id>
+      <id>os-windows</id>
       <activation>
         <os>
           <family>windows</family>
@@ -1593,6 +1634,9 @@
       </reporting>
     </profile>
 
+    <!--
+      Self enabling fake-plugin configuration to help Eclipse use Maven right
+    -->
     <profile>
       <id>only-eclipse</id>
       <activation>
diff --git a/sandbox/code-generation/driver-base-java/pom.xml b/sandbox/code-generation/driver-base-java/pom.xml
index c64f2a9..1a2f6d8 100644
--- a/sandbox/code-generation/driver-base-java/pom.xml
+++ b/sandbox/code-generation/driver-base-java/pom.xml
@@ -36,13 +36,11 @@
     <dependency>
       <groupId>com.github.jinahya</groupId>
       <artifactId>bit-io</artifactId>
-      <version>1.4.2</version>
     </dependency>
 
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sandbox/code-generation/language-base-freemarker/pom.xml b/sandbox/code-generation/language-base-freemarker/pom.xml
index 7a972da..184e3fe 100644
--- a/sandbox/code-generation/language-base-freemarker/pom.xml
+++ b/sandbox/code-generation/language-base-freemarker/pom.xml
@@ -36,24 +36,20 @@
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
       <artifactId>plc4x-code-generation-language-base</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.28</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
-      <version>1.6</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
     </dependency>
   </dependencies>
 
diff --git a/sandbox/code-generation/language-java/pom.xml b/sandbox/code-generation/language-java/pom.xml
index 2b91216..86731da 100644
--- a/sandbox/code-generation/language-java/pom.xml
+++ b/sandbox/code-generation/language-java/pom.xml
@@ -38,27 +38,24 @@
       <artifactId>plc4x-code-generation-language-base-freemarker</artifactId>
       <version>0.5.0-SNAPSHOT</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
       <artifactId>plc4x-code-generation-language-base</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.28</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
-      <version>1.6</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
     </dependency>
   </dependencies>
 
diff --git a/sandbox/code-generation/protocol-base-mspec/pom.xml b/sandbox/code-generation/protocol-base-mspec/pom.xml
index 2cb2bdf..7052107 100644
--- a/sandbox/code-generation/protocol-base-mspec/pom.xml
+++ b/sandbox/code-generation/protocol-base-mspec/pom.xml
@@ -53,18 +53,16 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-language-base</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <artifactId>plc4x-code-generation-protocol-base</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.6</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>${antlr.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/sandbox/code-generation/protocol-s7/pom.xml b/sandbox/code-generation/protocol-s7/pom.xml
index 5449eb3..4f397ad 100644
--- a/sandbox/code-generation/protocol-s7/pom.xml
+++ b/sandbox/code-generation/protocol-s7/pom.xml
@@ -35,13 +35,13 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-protocol-base</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <artifactId>plc4x-code-generation-protocol-base-mspec</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-protocol-base-mspec</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <artifactId>plc4x-code-generation-protocol-base</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/sandbox/code-generation/test-java-s7-driver/pom.xml b/sandbox/code-generation/test-java-s7-driver/pom.xml
index a3a599d..2d55561 100644
--- a/sandbox/code-generation/test-java-s7-driver/pom.xml
+++ b/sandbox/code-generation/test-java-s7-driver/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.plc4x.plugins</groupId>
     <artifactId>plc4x-code-generaton</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>test-java-s7-driver</artifactId>
@@ -37,7 +37,6 @@
       <plugin>
         <groupId>org.apache.plc4x.plugins</groupId>
         <artifactId>plc4x-maven-plugin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
         <executions>
           <execution>
             <id>test</id>
@@ -59,20 +58,19 @@
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
       <artifactId>plc4x-code-generation-driver-base-java</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.12</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
-      <artifactId>plc4x-code-generation-language-template-java</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <artifactId>plc4x-code-generation-language-java</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
       <!-- Scope is 'provided' as this way it's not shipped with the driver -->
       <scope>provided</scope>
     </dependency>
@@ -80,7 +78,7 @@
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
       <artifactId>plc4x-code-generation-protocol-s7</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>0.5.0-SNAPSHOT</version>
       <!-- Scope is 'provided' as this way it's not shipped with the driver -->
       <scope>provided</scope>
     </dependency>