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/01/28 13:04:27 UTC
[incubator-plc4x] branch develop updated: - Updated the plugin and
dependency versions for the used plugins. - Added some git exclusions for
CLion - Added some documentation on building with the C++ modules enabled.
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/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new e6ff5f9 - Updated the plugin and dependency versions for the used plugins. - Added some git exclusions for CLion - Added some documentation on building with the C++ modules enabled.
e6ff5f9 is described below
commit e6ff5f96678bef96554ee73820ef3a00e0d17ec7
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Jan 28 14:04:20 2019 +0100
- Updated the plugin and dependency versions for the used plugins.
- Added some git exclusions for CLion
- Added some documentation on building with the C++ modules enabled.
---
.gitignore | 4 +++-
README | 10 ++++++++--
pom.xml | 18 +++++++++---------
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index 59bde30..e132f1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,4 +83,6 @@ elasticsearch-data/
jqassistant/
# Exclude the C++ libs
-plc4cpp/libs/libs/
\ No newline at end of file
+plc4cpp/libs/libs/
+plc4cpp/.idea/
+plc4cpp/cmake-build-debug/
\ No newline at end of file
diff --git a/README b/README
index 5690a25..5977fd0 100644
--- a/README
+++ b/README
@@ -35,14 +35,20 @@ You must have Java 8 installed on your system and connectivity to Maven Central
(for downloading external third party dependencies). Maven will be automatically
downloaded and installed by the maven wrapper `mvnw`.
-Build PLC4X jars and install them in your local maven repository
+Build PLC4X Java jars and install them in your local maven repository
$ ./mvnw install # add -DskipTests to omit running the tests
-You can now construct applications that use PLC4X. The PLC4X samples
+You can now construct Java applications that use PLC4X. The PLC4X samples
are a good place to start and are available inside the `examples`
directory.
+If you want to also build the C++ libraries, this has to be enabled by activating
+
+the `with-cpp` profile
+
+$ ./mvnw -P with-cpp install # add -DskipTests to omit running the tests
+
Installing libpcap/WinPcap
--------------------------
diff --git a/pom.xml b/pom.xml
index df15eb9..64059f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -790,7 +790,7 @@
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1</version>
<executions>
<execution>
<id>get-flatly-bootstrap-theme</id>
@@ -920,7 +920,7 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.6</version>
+ <version>1.5.7.1</version>
<executions>
<execution>
<id>generate-asciidoc</id>
@@ -946,17 +946,17 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>9.1.13.0</version>
+ <version>9.2.5.0</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
- <version>1.5.6</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-diagram</artifactId>
- <version>1.5.4.1</version>
+ <version>1.5.12</version>
</dependency>
</dependencies>
</plugin>
@@ -1045,7 +1045,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
<configuration>
<finalName>apache-plc4x-incubating-${project.version}</finalName>
</configuration>
@@ -1235,7 +1235,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
+ <version>3.0.0</version>
</plugin>
<!-- Generate javadoc documentation -->
@@ -1347,7 +1347,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version> <!--$NO-MVN-MAN-VER$-->
+ <version>3.0.0-M2</version> <!--$NO-MVN-MAN-VER$-->
<executions>
<!-- Make sure no dependencies are used for which known vulnerabilities exist. -->
<execution>
@@ -1687,7 +1687,7 @@
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<executions>
<execution>
<goals>