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 97e1eac - Made sure the services resources are correctly merged
97e1eac is described below
commit 97e1eacfa912dbc106c955867b57041b58c34ae2
Author: Christofer Dutz <[email protected]>
AuthorDate: Sun Sep 1 12:00:00 2019 +0200
- Made sure the services resources are correctly merged
---
README | 6 ++++++
plc4j/examples/hello-storage-elasticsearch/pom.xml | 2 +-
plc4j/examples/pom.xml | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/README b/README
index c531e45..3d827ed 100644
--- a/README
+++ b/README
@@ -170,6 +170,12 @@
http://win-builds.org/doku.php/download_and_installation_from_windows
Make sure the `bin` directory containing the executable `mingw32-make.exe`
is on your systems `PATH`.
+Building with Docker
+-------------------------------
+
+ docker build -t plc4x .
+
+ docker run -p 9200:9200 -p 9300:9300 --name plc4x plc4x
Licensing
---------
diff --git a/plc4j/examples/hello-storage-elasticsearch/pom.xml
b/plc4j/examples/hello-storage-elasticsearch/pom.xml
index 14ee733..bcc556c 100644
--- a/plc4j/examples/hello-storage-elasticsearch/pom.xml
+++ b/plc4j/examples/hello-storage-elasticsearch/pom.xml
@@ -122,7 +122,7 @@
<goals>
<goal>shade</goal>
</goals>
- <configuration combine.children="append">
+ <configuration>
<filters>
<filter>
<artifact>*:*</artifact>
diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index 982e01c..e24be4b 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -74,7 +74,8 @@
<goal>shade</goal>
</goals>
<configuration>
- <transformers combine.children="append">
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${app.main.class}</mainClass>
</transformer>
