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 2020/04/02 06:44:47 UTC

[plc4x] branch develop updated (51b056e -> 893d4fe)

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.


    from 51b056e  - Updated to the released version of the plc4x-code-generation module
     new a166fc9  - Updated the used download-maven-plugin to 1.5.0
     new 893d4fe  - Fine tuned some execution names - Disabled the "proxy protocol" extraction

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 plc4j/integrations/logstash-plugin/pom.xml | 1 -
 pom.xml                                    | 2 +-
 sandbox/plc4cpp/pom.xml                    | 9 ++++-----
 tools/boost/pom.xml                        | 1 -
 tools/logstash/pom.xml                     | 1 -
 tools/thrift/pom.xml                       | 1 -
 6 files changed, 5 insertions(+), 10 deletions(-)


[plc4x] 01/02: - Updated the used download-maven-plugin to 1.5.0

Posted by cd...@apache.org.
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

commit a166fc9ce8a453192747b3b784ad6b0532c4c857
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Apr 2 08:42:59 2020 +0200

    - Updated the used download-maven-plugin to 1.5.0
---
 plc4j/integrations/logstash-plugin/pom.xml | 1 -
 pom.xml                                    | 2 +-
 tools/boost/pom.xml                        | 1 -
 tools/logstash/pom.xml                     | 1 -
 tools/thrift/pom.xml                       | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index 7978134..ece9a9c 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -79,7 +79,6 @@
       <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
         <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.1</version>
         <executions>
           <execution>
             <id>get-jruby</id>
diff --git a/pom.xml b/pom.xml
index e053029..ffe7dfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1152,7 +1152,7 @@
         <plugin>
           <groupId>com.googlecode.maven-download-plugin</groupId>
           <artifactId>download-maven-plugin</artifactId>
-          <version>1.4.2</version>
+          <version>1.5.0</version>
         </plugin>
 
         <plugin>
diff --git a/tools/boost/pom.xml b/tools/boost/pom.xml
index 7abc9a0..b3d149c 100644
--- a/tools/boost/pom.xml
+++ b/tools/boost/pom.xml
@@ -44,7 +44,6 @@
       <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
         <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
         <executions>
           <execution>
             <id>get-boost</id>
diff --git a/tools/logstash/pom.xml b/tools/logstash/pom.xml
index 946b25a..3ca4981 100644
--- a/tools/logstash/pom.xml
+++ b/tools/logstash/pom.xml
@@ -38,7 +38,6 @@
       <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
         <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
         <executions>
           <execution>
             <id>get-logstash</id>
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index ed16786..2e734b3 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -178,7 +178,6 @@
       <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
         <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
         <executions>
           <!-- Download the CMake binary distribution for this platform. -->
           <execution>


[plc4x] 02/02: - Fine tuned some execution names - Disabled the "proxy protocol" extraction

Posted by cd...@apache.org.
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

commit 893d4fe9f633b9e80b6d503a4b9805d0be11d9f5
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Apr 2 08:43:52 2020 +0200

    - Fine tuned some execution names
    - Disabled the "proxy protocol" extraction
---
 sandbox/plc4cpp/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sandbox/plc4cpp/pom.xml b/sandbox/plc4cpp/pom.xml
index a9a1b38..02af1e7 100644
--- a/sandbox/plc4cpp/pom.xml
+++ b/sandbox/plc4cpp/pom.xml
@@ -134,14 +134,14 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>get-boost</id>
+                <id>get-thrift</id>
                 <phase>generate-sources</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
                 <configuration>
                   <artifactItems combine.children="append">
-                    <!-- Get the pre-packaged boost library -->
+                    <!-- Get the pre-packaged thrift library -->
                     <artifactItem>
                       <groupId>org.apache.plc4x</groupId>
                       <artifactId>plc4x-tools-thrift</artifactId>
@@ -166,7 +166,6 @@
       <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
         <artifactId>download-maven-plugin</artifactId>
-        <version>1.4.0</version>
         <executions>
           <execution>
             <id>get-cmake</id>
@@ -208,14 +207,14 @@
                   <outputDirectory>${project.build.directory}/lib/boost</outputDirectory>
                 </artifactItem>
                 <!-- Unpack the protocol spec for the proxy driver -->
-                <artifactItem>
+                <!--artifactItem>
                   <groupId>org.apache.plc4x</groupId>
                   <artifactId>plc4x-protocols-proxy</artifactId>
                   <version>${project.version}</version>
                   <type>jar</type>
                   <overWrite>true</overWrite>
                   <outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
-                </artifactItem>
+                </artifactItem-->
                 <!-- Unpack the thrift compiler -->
                 <artifactItem>
                   <groupId>org.apache.plc4x</groupId>