You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2019/11/28 10:45:16 UTC
[plc4x] branch develop updated: remove post release version messup
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 15c8dff remove post release version messup
15c8dff is described below
commit 15c8dff15af67060d771b646adf21b6f3d613f85
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Nov 28 11:42:34 2019 +0100
remove post release version messup
---
RELEASE_NOTES | 2 +-
plc4j/integrations/apache-kafka/README.md | 2 +-
plc4j/integrations/logstash-plugin/README.md | 2 +-
.../src/gem/lib/logstash-input-plc4x_jars.rb | 2 +-
.../src/test/java/org/apache/plc4x/karaf/FeatureIT.java | 2 +-
plc4j/karaf-features/s7/src/main/feature/feature.xml | 2 +-
sandbox/test-java-df1-driver/README.adoc | 2 +-
src/site/asciidoc/developers/code-gen/index.adoc | 14 +++++++-------
src/site/asciidoc/developers/release.adoc | 2 +-
src/site/asciidoc/users/download.adoc | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index c1d9792..80528f8 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -14,7 +14,7 @@ Bug Fixes
---------
==============================================================
-Apache PLC4X 0.5.0-SNAPSHOT
+Apache PLC4X 0.6.0-SNAPSHOT
==============================================================
This is the first release containing our new generaed drivers (AB-ETH)
diff --git a/plc4j/integrations/apache-kafka/README.md b/plc4j/integrations/apache-kafka/README.md
index cfc43a5..af05ed5 100644
--- a/plc4j/integrations/apache-kafka/README.md
+++ b/plc4j/integrations/apache-kafka/README.md
@@ -38,7 +38,7 @@ In order to start a Kafka Connect system the following steps have to be performe
1) Download the latest version of Apache Kafka binaries from here: https://kafka.apache.org/downloads
2) Unpack the archive.
-3) Copy the `target/plc4j-apache-kafka-0.5.0-SNAPSHOT-uber-jar.jar` to the Kafka `libs` directory.
+3) Copy the `target/plc4j-apache-kafka-0.6.0-SNAPSHOT-uber-jar.jar` to the Kafka `libs` directory.
4) Copy the files in the `config` to Kafka's `configs` directory.
### Start a Kafka Broker
diff --git a/plc4j/integrations/logstash-plugin/README.md b/plc4j/integrations/logstash-plugin/README.md
index 607406e..2eed1ea 100644
--- a/plc4j/integrations/logstash-plugin/README.md
+++ b/plc4j/integrations/logstash-plugin/README.md
@@ -65,6 +65,6 @@ input {
./mvnw clean package -P with-logstash
# To install the plugin:
-1) Copy the build plugin *logstash-input-plc4x-0.5.0.gem* from your target/gem directory to the Logstash plugin directory *logstash/plugin*
+1) Copy the build plugin *logstash-input-plc4x-0.6.0.gem* from your target/gem directory to the Logstash plugin directory *logstash/plugin*
2) Follow installation instructions from Logstash documentation: https://www.elastic.co/guide/en/logstash/current/working-with-plugins.html
3) Create pipeline file (see example pipeline above)
\ No newline at end of file
diff --git a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
index eb692e9..7b53290 100644
--- a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
+++ b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
@@ -18,5 +18,5 @@
# ----------------------------------------------------------------------------
require 'jar_dependencies'
-# TODO replace 0.5.0 with version
+# TODO replace 0.6.0 with version
require_jar('${project.groupId}', 'logstash-input-plc4x', '${current-full-version}')
\ No newline at end of file
diff --git a/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java b/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
index 6d2bc16..92d79a8 100644
--- a/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
+++ b/plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
@@ -74,7 +74,7 @@ public class FeatureIT extends KarafTestSupport {
String bundles = executeCommand("bundle:list -t 0");
// Find that line
- // 84 │ Active │ 80 │ 0.5.0.SNAPSHOT │ PLC4J: Driver: S7
+ // 84 │ Active │ 80 │ 0.6.0.SNAPSHOT │ PLC4J: Driver: S7
assertContains("PLC4J: Driver: S7", bundles);
System.out.println(bundles);
diff --git a/plc4j/karaf-features/s7/src/main/feature/feature.xml b/plc4j/karaf-features/s7/src/main/feature/feature.xml
index 6b78838..c5fc8a4 100644
--- a/plc4j/karaf-features/s7/src/main/feature/feature.xml
+++ b/plc4j/karaf-features/s7/src/main/feature/feature.xml
@@ -18,7 +18,7 @@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="driver-s7-feature">
- <feature name="driver-s7-feature" description="driver-s7-feature" version="0.5.0.SNAPSHOT">
+ <feature name="driver-s7-feature" description="driver-s7-feature" version="0.6.0.SNAPSHOT">
<details>PLC4X is an effort to create a universal library for accessing industrial programmable logic controllers
using a variety of protocols using a uniform API.
</details>
diff --git a/sandbox/test-java-df1-driver/README.adoc b/sandbox/test-java-df1-driver/README.adoc
index d513383..69c3509 100644
--- a/sandbox/test-java-df1-driver/README.adoc
+++ b/sandbox/test-java-df1-driver/README.adoc
@@ -22,7 +22,7 @@ Add the driver to the pom.xml
<dependency>
<groupId>org.apache.plc4x.sandbox</groupId>
<artifactId>test-java-df1-driver</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
diff --git a/src/site/asciidoc/developers/code-gen/index.adoc b/src/site/asciidoc/developers/code-gen/index.adoc
index ce72755..c6ad292 100644
--- a/src/site/asciidoc/developers/code-gen/index.adoc
+++ b/src/site/asciidoc/developers/code-gen/index.adoc
@@ -176,7 +176,7 @@ Here's an example of a driver pom for building a `S7` driver for `java`:
<parent>
<groupId>org.apache.plc4x.plugins</groupId>
<artifactId>plc4x-code-generaton</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</parent>
<artifactId>test-java-s7-driver</artifactId>
@@ -207,13 +207,13 @@ Here's an example of a driver pom for building a `S7` driver for `java`:
<dependency>
<groupId>org.apache.plc4x.plugins</groupId>
<artifactId>plc4x-code-generation-driver-base-java</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x.plugins</groupId>
<artifactId>plc4x-code-generation-language-java</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
@@ -221,7 +221,7 @@ Here's an example of a driver pom for building a `S7` driver for `java`:
<dependency>
<groupId>org.apache.plc4x.plugins</groupId>
<artifactId>plc4x-code-generation-protocol-s7</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
@@ -237,7 +237,7 @@ The dependency:
<dependency>
<groupId>org.apache.plc4x.plugins</groupId>
<artifactId>plc4x-code-generation-driver-base-java</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
</dependency>
For example contains all classes the generated code relies on.
@@ -247,7 +247,7 @@ The definitions of both the `s7` protocol as well as the `java` language are pro
<dependency>
<groupId>org.apache.plc4x.plugins</groupId>
<artifactId>plc4x-code-generation-language-java</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
@@ -257,7 +257,7 @@ and:
<dependency>
<groupId>org.apache.plc4x.plugins</groupId>
<artifactId>plc4x-code-generation-protocol-s7</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
diff --git a/src/site/asciidoc/developers/release.adoc b/src/site/asciidoc/developers/release.adoc
index a5afe50..379a248 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -108,7 +108,7 @@ Otherwise we would have to define the working copy version for each module.
mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,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:
+So in case of preparing the release branch for `0.6.0-SNAPSHOT` the command would be the following:
[subs="verbatim,attributes"]
----
diff --git a/src/site/asciidoc/users/download.adoc b/src/site/asciidoc/users/download.adoc
index 94334ce..d5c8ac4 100644
--- a/src/site/asciidoc/users/download.adoc
+++ b/src/site/asciidoc/users/download.adoc
@@ -21,8 +21,8 @@ Be sure to verify your downloads by these https://www.apache.org/info/verificati
=== Current Releases
-[#release-0.5.0]
-==== 0.5.0 Official https://www.apache.org/dyn/closer.lua/plc4x/0.5.0/apache-plc4x-0.5.0-source-release.zip[source release] [ https://www.apache.org/dist/plc4x/0.5.0/apache-plc4x-0.5.0-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/plc4x/0.5.0/apache-plc4x-0.5.0-source-release.zip.asc[ASC] ]
+[#release-0.6.0]
+==== 0.6.0 Official https://www.apache.org/dyn/closer.lua/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip[source release] [ https://www.apache.org/dist/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/plc4x/0.6.0/apache-plc4x-0.6.0-source-release.zip.asc[ASC] ]
This is the first release containing our new generaed drivers (AB-ETH)