[plc4x] branch develop updated: - Post-release cleanup

[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


The following commit(s) were added to refs/heads/develop by this push:
     new a432200  - Post-release cleanup
a432200 is described below

commit a43220093b611284b0a1596d4589cae2213a8838
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri May 15 19:16:17 2020 +0200

    - Post-release cleanup
---
 plc4j/examples/pom.xml                                                 | 3 +--
 .../src/main/java/org/apache/plc4x/camel/Plc4XProducer.java            | 2 --
 {plc4j/examples => sandbox}/hello-influx-data-collection/README.adoc   | 0
 .../hello-influx-data-collection/example.properties                    | 0
 {plc4j/examples => sandbox}/hello-influx-data-collection/pom.xml       | 0
 .../java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java   | 0
 .../hello-influx-data-collection/src/main/resources/logback.xml        | 0
 sandbox/pom.xml                                                        | 3 +++
 src/site/asciidoc/developers/release/release.adoc                      | 2 +-
 9 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index 5a2366e..7b248ff 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -44,11 +44,10 @@
     <module>hello-cloud-google</module>
     <module>hello-connectivity-kafka</module>
     <module>hello-connectivity-mqtt</module>
-    <module>hello-influx-data-collection</module>
     <module>hello-integration-edgent</module>
     <module>hello-opm</module>
     <module>hello-storage-elasticsearch</module>
-    <!--module>hello-webapp</module-->
+    <module>hello-webapp</module>
     <module>hello-world-plc4x</module>
     <module>hello-integration-iotdb</module>
   </modules>
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java
index 2325d3a..b97277e 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XProducer.java
@@ -22,7 +22,6 @@ import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.support.DefaultAsyncProducer;
-import org.apache.commons.math3.util.Pair;
 import org.apache.plc4x.java.api.PlcConnection;
 import org.apache.plc4x.java.api.exceptions.PlcException;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
@@ -31,7 +30,6 @@ import org.apache.plc4x.java.api.messages.PlcWriteResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/plc4j/examples/hello-influx-data-collection/README.adoc b/sandbox/hello-influx-data-collection/README.adoc
similarity index 100%
rename from plc4j/examples/hello-influx-data-collection/README.adoc
rename to sandbox/hello-influx-data-collection/README.adoc
diff --git a/plc4j/examples/hello-influx-data-collection/example.properties b/sandbox/hello-influx-data-collection/example.properties
similarity index 100%
rename from plc4j/examples/hello-influx-data-collection/example.properties
rename to sandbox/hello-influx-data-collection/example.properties
diff --git a/plc4j/examples/hello-influx-data-collection/pom.xml b/sandbox/hello-influx-data-collection/pom.xml
similarity index 100%
rename from plc4j/examples/hello-influx-data-collection/pom.xml
rename to sandbox/hello-influx-data-collection/pom.xml
diff --git a/plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java b/sandbox/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java
similarity index 100%
rename from plc4j/examples/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java
rename to sandbox/hello-influx-data-collection/src/main/java/org/apache/plc4x/java/examples/helloinflux/HelloInflux.java
diff --git a/plc4j/examples/hello-influx-data-collection/src/main/resources/logback.xml b/sandbox/hello-influx-data-collection/src/main/resources/logback.xml
similarity index 100%
rename from plc4j/examples/hello-influx-data-collection/src/main/resources/logback.xml
rename to sandbox/hello-influx-data-collection/src/main/resources/logback.xml
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index d0d6766..cf6cc74 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -45,6 +45,9 @@
     <module>test-streampipes-plc4x-adapters</module>
     <module>test-streampipes-plc4x-processors</module>
     <module>test-streampipes-plc4x-shared</module>
+
+    <!-- Examples -->
+    <module>hello-influx-data-collection</module>
   </modules>
 
   <dependencies>
diff --git a/src/site/asciidoc/developers/release/release.adoc b/src/site/asciidoc/developers/release/release.adoc
index fd40636..c868054 100644
--- a/src/site/asciidoc/developers/release/release.adoc
+++ b/src/site/asciidoc/developers/release/release.adoc
@@ -280,7 +280,7 @@ However it will not delete the tag in GIT (locally and remotely). So you have to
 
 This is done by executing another goal of the `maven-release-plugin`:
 
-   mvn release:perform -DreleaseProfiles=apache-release,with-boost,with-proxies,with-logstash
+   mvn release:perform
 
 This executes automatically as all information it requires is located in the `release.properties` file the `prepare` goal prepared.