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 19:28:33 UTC
[plc4x] 01/03: - Streamlined some plugin versions
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 0bddcd255bdc16a46c5b942a1c2cd70d0d7824d1
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Apr 2 21:26:35 2020 +0200
- Streamlined some plugin versions
---
plc4j/integrations/logstash-plugin/pom.xml | 3 ---
plc4j/protocols/delta-v/pom.xml | 2 --
pom.xml | 34 ++++++++++++++++++++++++------
sandbox/plc4net/api/pom.xml | 1 -
sandbox/plc4net/plc4net.driver/pom.xml | 1 -
sandbox/plc4py/pom.xml | 1 -
tools/boost/pom.xml | 3 +--
tools/logstash/pom.xml | 2 --
tools/thrift/pom.xml | 9 +++-----
9 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index ece9a9c..716da82 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<id>provide-custom-properties</id>
@@ -142,7 +141,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>run-gem-build</id>
@@ -167,7 +165,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>attach-gem</id>
diff --git a/plc4j/protocols/delta-v/pom.xml b/plc4j/protocols/delta-v/pom.xml
index 17a3c3a..404ca51 100644
--- a/plc4j/protocols/delta-v/pom.xml
+++ b/plc4j/protocols/delta-v/pom.xml
@@ -114,7 +114,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<configuration>
<classpathScope>test</classpathScope>
<mainClass>org.apache.plc4x.java.deltav.PoCInflux</mainClass>
@@ -144,7 +143,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<configuration combine.children="append">
<arguments>${pcapng.file.path}</arguments>
</configuration>
diff --git a/pom.xml b/pom.xml
index 44e29dd..419f8ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
<boost.version.underline-short>1_71</boost.version.underline-short>
<boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
<byte-buddy.version>1.9.10</byte-buddy.version>
+ <!-- CMake 3.17.0 is already released, but we should keep it in sync with the cmake-maven-plugn -->
<cmake-version>3.16.0</cmake-version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-cli.version>1.4</commons-cli.version>
@@ -1334,6 +1335,30 @@
<artifactId>dependency-check-maven</artifactId>
<version>${owasp-dependency-check.version}</version>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.thrift.tools</groupId>
+ <artifactId>maven-thrift-plugin</artifactId>
+ <version>0.1.11</version>
+ </plugin>
+
+ <plugin>
+ <groupId>com.googlecode.cmake-maven-project</groupId>
+ <artifactId>cmake-maven-plugin</artifactId>
+ <version>3.16.3-b2</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -1514,8 +1539,7 @@
<os.suffix>linux</os.suffix>
<os.classifier>linux-x86_64</os.classifier>
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Linux-x86_64.tar.gz</cmake.url>
- <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-Linux-x86_64</cmake.root-dir>
- <cmake.child-dir>bin/cmake</cmake.child-dir>
+ <cmake.root>${project.build.directory}/cmake-${cmake-version}-Linux-x86_64/bin/</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.tar.gz</boost.url>
<boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
@@ -1539,8 +1563,7 @@
<os.suffix>mac</os.suffix>
<os.classifier>mac-x86_64</os.classifier>
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-Darwin-x86_64.tar.gz</cmake.url>
- <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-Darwin-x86_64</cmake.root-dir>
- <cmake.child-dir>CMake.app/Contents/BIN/cmake</cmake.child-dir>
+ <cmake.root>${project.build.directory}/cmake-${cmake-version}-Darwin-x86_64/CMake.app/Contents/bin</cmake.root>
<cmake.generator>Unix Makefiles</cmake.generator>
<boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.tar.gz</boost.url>
<boost.bootstrap.executable>./bootstrap.sh</boost.bootstrap.executable>
@@ -1564,8 +1587,7 @@
<os.suffix>win</os.suffix>
<os.classifier>windows-x86_64</os.classifier>
<cmake.url>https://github.com/Kitware/CMake/releases/download/v${cmake-version}/cmake-${cmake-version}-win64-x64.zip</cmake.url>
- <cmake.root-dir>${project.build.directory}/cmake-${cmake-version}-win64-x64</cmake.root-dir>
- <cmake.child-dir>bin/cmake.exe</cmake.child-dir>
+ <cmake.root>${project.build.directory}/cmake-${cmake-version}-win64-x64/bin</cmake.root>
<cmake.generator>MinGW Makefiles</cmake.generator>
<boost.url>https://dl.bintray.com/boostorg/release/${boost.version}/source/boost_${boost.version.underline}.zip</boost.url>
<boost.bootstrap.executable>bootstrap.bat</boost.bootstrap.executable>
diff --git a/sandbox/plc4net/api/pom.xml b/sandbox/plc4net/api/pom.xml
index c34c5e8..520706a 100644
--- a/sandbox/plc4net/api/pom.xml
+++ b/sandbox/plc4net/api/pom.xml
@@ -43,7 +43,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>dotnet-build</id>
diff --git a/sandbox/plc4net/plc4net.driver/pom.xml b/sandbox/plc4net/plc4net.driver/pom.xml
index 0d50ec7..fa86033 100644
--- a/sandbox/plc4net/plc4net.driver/pom.xml
+++ b/sandbox/plc4net/plc4net.driver/pom.xml
@@ -43,7 +43,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>dotnet-build</id>
diff --git a/sandbox/plc4py/pom.xml b/sandbox/plc4py/pom.xml
index 37b3309..df18b95 100644
--- a/sandbox/plc4py/pom.xml
+++ b/sandbox/plc4py/pom.xml
@@ -145,7 +145,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>python-build</id>
diff --git a/tools/boost/pom.xml b/tools/boost/pom.xml
index b3d149c..fbf1b30 100644
--- a/tools/boost/pom.xml
+++ b/tools/boost/pom.xml
@@ -69,7 +69,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>bootstrap-boost</id>
@@ -118,8 +117,8 @@
<!-- Build a zip artifact containing the boost library -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>package-boost-library</id>
diff --git a/tools/logstash/pom.xml b/tools/logstash/pom.xml
index 3ca4981..08042ad 100644
--- a/tools/logstash/pom.xml
+++ b/tools/logstash/pom.xml
@@ -57,7 +57,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>compile-logstash-core</id>
@@ -79,7 +78,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>attach-jars</id>
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 2e734b3..f422b67 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -53,7 +53,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>make-cmake-executable</id>
@@ -89,7 +88,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<id>make-cmake-executable</id>
@@ -120,8 +118,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>package-thrift-cpp</id>
@@ -150,8 +148,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>package-thrift-python</id>
@@ -240,7 +238,6 @@
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<artifactId>cmake-maven-plugin</artifactId>
- <version>3.7.2-b1</version>
<executions>
<!-- Uses a CMake generator to generate the build using the build tool of choice -->
<execution>
@@ -308,8 +305,8 @@
<!-- Add the thrift compiler executable to the build -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>source-release-assembly</id>