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:09 UTC
[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
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>