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/10/23 09:52:07 UTC
[plc4x] branch develop updated (929229f -> 3aa3992)
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 929229f [maven-release-plugin] prepare for next development iteration
new 455f816 - Fixed some of the content on the starting page as reported by Sebb in https://issues.apache.org/jira/browse/PLC4X-145
new 5f19cab - Merged some changes from the release branch back to develop -- The way the logstash-core is being built -- Some textual updates on the releases
new 3aa3992 - Added some profiles to the guides to create the release branch
The 3 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:
plc4cpp/pom.xml | 10 +++---
plc4j/integrations/logstash-plugin/pom.xml | 23 +++++++-------
src/site/asciidoc/developers/release.adoc | 16 +++-------
src/site/asciidoc/index.adoc | 4 +--
tools/boost/pom.xml | 2 +-
tools/logstash/pom.xml | 51 ++++++++----------------------
6 files changed, 38 insertions(+), 68 deletions(-)
[plc4x] 01/03: - Fixed some of the content on the starting page as
reported by Sebb in https://issues.apache.org/jira/browse/PLC4X-145
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 455f8168b8a199222e92b230e5363b95c37474bf
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 23 11:37:09 2019 +0200
- Fixed some of the content on the starting page as reported by Sebb in https://issues.apache.org/jira/browse/PLC4X-145
---
src/site/asciidoc/index.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 67194c5..76492b2 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -50,7 +50,7 @@ The major benefits of PLC4X™ over OPC-UA, from our point of view are:
- Activating OPC-UA support on existing PLCs greatly increases the load on the PLCs
- No need to pay for licenses to activate OPC-UA support
-At first we will be concentrating on providing adapters for the most widely used protocol such as:
+At first we will be concentrating on providing adapters for the most widely used protocols such as:
- icon:pause-circle[role=light-gray] BACnet
- icon:check[role=green] link:protocols/ads/index.html[Beckhoff ADS (TCP)]
@@ -81,7 +81,7 @@ a|image::apache_nifi_logo.svg[width=80%,link=https://nifi.apache.org] a|image::a
|icon:wrench[role=yellow] https://nifi.apache.org[Apache Nifi™] |icon:pause-circle[role=light-gray] https://brooklyn.apache.org[Apache Brooklyn™] |icon:pause-circle[role=light-gray] https://mynewt.apache.org[Apache Mynewt™]
|===
-Hereby greatly reducing the barriers and the learning curve for creating industrial IoT applications.
+This greatly reduces the barriers and the learning curve for creating industrial IoT applications.
=== Upcoming Conferences & Meetups
[plc4x] 03/03: - Added some profiles to the guides to create the
release branch
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 3aa399239b0aa8aca9e7b81ea93335a2dec35a80
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 23 11:52:00 2019 +0200
- Added some profiles to the guides to create the release branch
---
src/site/asciidoc/developers/release.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/asciidoc/developers/release.adoc b/src/site/asciidoc/developers/release.adoc
index 585bc5e..d967190 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -105,7 +105,7 @@ This is the version the `develop` branch will be changed to.
The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
Otherwise we would have to define the working copy version for each module.
- mvn release:branch -P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
+ mvn release:branch -P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox,with-boost,with-logstash -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
So in case of preparing the release branch for `0.5.0-SNAPSHOT` the command would be the following:
[plc4x] 02/03: - Merged some changes from the release branch back
to develop -- The way the logstash-core is being built -- Some textual
updates on the releases
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 5f19cab857dd0245086d568e840dc9b7214b3054
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 23 11:50:34 2019 +0200
- Merged some changes from the release branch back to develop
-- The way the logstash-core is being built
-- Some textual updates on the releases
---
plc4cpp/pom.xml | 10 +++---
plc4j/integrations/logstash-plugin/pom.xml | 23 +++++++-------
src/site/asciidoc/developers/release.adoc | 14 ++------
tools/boost/pom.xml | 2 +-
tools/logstash/pom.xml | 51 ++++++++----------------------
5 files changed, 35 insertions(+), 65 deletions(-)
diff --git a/plc4cpp/pom.xml b/plc4cpp/pom.xml
index 87b63f3..be2ad5b 100644
--- a/plc4cpp/pom.xml
+++ b/plc4cpp/pom.xml
@@ -145,7 +145,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<type>zip</type>
<classifier>cpp-${os.classifier}</classifier>
<outputDirectory>${project.build.directory}/lib/thrift</outputDirectory>
@@ -202,7 +202,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-boost</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<type>zip</type>
<classifier>lib-${os.classifier}</classifier>
<outputDirectory>${project.build.directory}/lib/boost</outputDirectory>
@@ -211,7 +211,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-proxy</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
@@ -220,7 +220,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<type>zip</type>
<classifier>compiler-${os.classifier}</classifier>
<overWrite>true</overWrite>
@@ -336,7 +336,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-boost</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index 0691b98..669ec18 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-integrations</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>plc4j-logstash-plugin</artifactId>
@@ -215,59 +215,60 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-connection-pool</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-scraper</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-logstash-core</artifactId>
- <version>${project.version}-${logstash.version}</version>
+ <version>0.6.0-SNAPSHOT</version>
+ <classifier>${logstash.version}</classifier>
</dependency>
<!-- Include all drivers -->
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-ads</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-ethernet-ip</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-modbus</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-opcua</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-s7</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-simulated</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/src/site/asciidoc/developers/release.adoc b/src/site/asciidoc/developers/release.adoc
index c697204..585bc5e 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -173,25 +173,17 @@ In order to prepare a release-candidate, the first step is switching to the corr
After that, the following command will to all preparation steps for the release:
- mvn release:prepare -P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox -DautoVersionSubmodules=true
+ mvn release:prepare -P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox,with-boost,with-logstash -DautoVersionSubmodules=true
-(The `-P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox` tells maven to activate the all profiles that partition the build and makes sure the versions of all modules are updated as part of the release)
+(The `-P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox,with-boost,with-logstash` tells maven to activate the all profiles that partition the build and makes sure the versions of all modules are updated as part of the release)
In general the plugin will now ask you 3 questions:
1. The version we want to release as (It will suggest the version you get by omitting the `-SNAPSHOT` suffix)
2. The name of the tag the release commit will be tagged with in the SCM (Name it `release/{release-version}` (`release/{current-full-version}` in our case)
-3. The next development version (The version present in the pom after the release) (`{current-next-minor-version}` in our case)
+3. The next development version (The version present in the pom after the release) (`{current-next-bugfix-version}` in our case)
Usually for 1 and 3 the defaults are just fine, make sure the tag name is correct as this usually is different.
-We currently have a dependency to a SNAPSHOT dependency in the sandbox module.
-The release plugin will complain about this and we will not be able to release this way.
-As this in the sandbox module, we can force the plugin to continue by appending:
-
- -DignoreSnapshots=true
-
-However it is important to check that nowhere else SNAPSHOT versions are referenced.
-
What the plugin now does, is automatically execute the following operations:
1. Check we aren't referencing any `SNAPSHOT` dependencies.
diff --git a/tools/boost/pom.xml b/tools/boost/pom.xml
index 6172f1d..83cb237 100644
--- a/tools/boost/pom.xml
+++ b/tools/boost/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>plc4x-tools-boost</artifactId>
diff --git a/tools/logstash/pom.xml b/tools/logstash/pom.xml
index a78de4e..4cebdd5 100644
--- a/tools/logstash/pom.xml
+++ b/tools/logstash/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>plc4x-tools-logstash-core</artifactId>
@@ -78,51 +78,28 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
<executions>
<execution>
- <id>install-logstash-core-jar</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4x-tools-logstash-core</artifactId>
- <version>${project.version}-${logstash.version}</version>
- <packaging>jar</packaging>
- <file>${project.build.directory}/logstash-${logstash.version}/logstash-core/build/libs/logstash-core-${logstash.version}.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-logstash-core-sources-jar</id>
- <phase>install</phase>
+ <id>attach-jars</id>
+ <phase>package</phase>
<goals>
- <goal>install-file</goal>
+ <goal>attach-artifact</goal>
</goals>
<configuration>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4x-tools-logstash-core</artifactId>
- <version>${project.version}-${logstash.version}</version>
- <packaging>jar</packaging>
- <classifier>sources</classifier>
- <file>${project.build.directory}/logstash-${logstash.version}/logstash-core/build/libs/logstash-core-${logstash.version}-sources.jar</file>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/logstash-${logstash.version}/logstash-core/build/libs/logstash-core-${logstash.version}.jar</file>
+ <type>jar</type>
+ <classifier>${logstash.version}</classifier>
+ </artifact>
+ </artifacts>
</configuration>
</execution>
</executions>
</plugin>
-
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-logstash-core-jar</id>
- <phase></phase>
- </execution>
- </executions>
- </plugin-->
</plugins>
</build>