Merge branches 'develop' and 'feature/c-code-generation' of https://g…

…itbox.apache.org/repos/asf/plc4x into feature/c-code-generation

plc4j/drivers/opcua/pom.xml

@@ -94,17 +94,17 @@
     <dependency>
       <groupId>org.eclipse.milo</groupId>
       <artifactId>sdk-client</artifactId>
-      <version>0.3.6</version>
+      <version>0.3.7</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.milo</groupId>
       <artifactId>stack-core</artifactId>
-      <version>0.3.6</version>
+      <version>0.3.7</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.milo</groupId>
       <artifactId>stack-client</artifactId>
-      <version>0.3.6</version>
+      <version>0.3.7</version>
     </dependency>
 
     <dependency>
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>org.eclipse.milo</groupId>
       <artifactId>server-examples</artifactId>
-      <version>0.3.6</version>
+      <version>0.3.7</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/site/asciidoc/users/users.adoc → src/site/asciidoc/users/adopters.adoc

@@ -19,24 +19,14 @@
 
 == Companies using Apache PLC4X
 
-The people working on Apache PLC4X, and the companies behind them have put an enormous amount of effort into creating this great tool.
-
-The problem some of them are facing, is that they are usually not allowed to mention which companies are using PLC4X.
+image::toddy-loves-apache.png[width=200,float=left]
 
-However being able to name references is most vital nowdays in gaining trust.
-
-So if you work for a company which is using Apache PLC4X, one way you can help the project is by admitting you are using it.
-
-This might be only very little active contribution on your side, but for the project this is of extremely high value.
-
-On this page we are maintaining a list of companies openly communicating that they are using Apache PLC4X.
-
-If your company is using Apache PLC4X and you would like to give back to the community, please create a Pull-Request on github or post an email to dev@plc4x.apache.org and give us the permission to list your company.
+The companies in the following list are actively using Apache PLC4X.
 
 |===
 ||Name |Market |Description
 
-a|image::users/companies/logo-codecentric.png[cc, 200, 200] |https://www.codecentric.de[codecentric AG^,opts=nofollow] |IT Consulting |Individual Software Development
+a|image::users/companies/logo-codecentric.png[cc, 200, 200] |https://www.codecentric.de[codecentric AG^,opts=nofollow] |IT Consulting |We develop software that solves real problems - and PLC4X solves the problem of IoT connectivity in a highly performant and open source way
 
 a|image::users/companies/logo-pragmatic-minds.svg[pm, 200, 200] |https://www.pragmaticminds.de[pragmatic minds GmbH^,opts=nofollow] |Big Data / Analytics |We use PLC4X to collect data from different types of PLCs as preliminary step for data analytics and visualization.
 
@@ -45,3 +35,17 @@ a|image::users/companies/logo-pragmatic-industries.svg[pi, 200, 200] |https://ww
 // TODO: Add your company in alphabetical order ...
 
 |===
+
+The people working on Apache PLC4X, and the companies behind them have put an enormous amount of effort into creating this great tool.
+
+The problem some of them are facing, is that they are usually not allowed to mention which companies are using PLC4X.
+
+However being able to name references is most vital nowdays in gaining trust.
+
+So if you work for a company which is using Apache PLC4X, one way you can help the project is by admitting you are using it.
+
+This might be only very little active contribution on your side, but for the project this is of extremely high value.
+
+On this page we are maintaining a list of companies openly communicating that they are using Apache PLC4X.
+
+If your company is using Apache PLC4X and you would like to give back to the community, please create a Pull-Request on github or post an email to dev@plc4x.apache.org and give us the permission to list your company.

src/site/asciidoc/users/commercial-support.adoc

@@ -0,0 +1,51 @@
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+:imagesdir: ../images/
+:icons: font
+
+== Commercial support offerings for Apache PLC4X
+
+image::toddy-loves-apache.png[width=200,float=left]
+
+As every Apache project, so is `Apache PLC4X` generally available and usable by anyone free of charge.
+
+Also does the `Apache PLC4X Community` offer free support on the official project `Mailinglist`.
+This support is however done voluntatily by the community, so there are no service-level-agreements, guaranteed reaction times or guarantee that an issue will be addressed or solved.
+
+If you or your business has higher demands on guaranteed availability and execution of support requests,
+the following individuals and companies have commercial support offerings.
+
+The information provided here was provided by the entities named, and is not verified (except the `Involvement Level`), updated or endorsed by the `Apache Software Foundation` or the `Apache PLC4X` project.
+
+|===
+||Name |Description |Contact Person(s) |Contact Email(s) |Contact Phone(s) |Involvement Level
+
+a|image::users/companies/logo-codecentric.png[cc, 200, 200] |https://www.codecentric.de/innovation/industrial-iot-mit-apache-plc4x/[codecentric AG^,opts=nofollow] |commercial support, training, workshops, consulting, individual software-develpment |Christofer Dutz |christofer.dutz@codecentric.de |  |PMC Member
+
+// TODO: Add your company in alphabetical order ...
+
+|===
+
+=== Who can be added to this list?
+
+Anyone who provides `Apache PLC4X` related services can be added to this list (e.g. taining, consulting, custom software development, support, installation or related services).
+
+=== How can I get added to this list?
+
+Please create a Pull-Request on GitHub as described https://plc4x.apache.org/developers/contributing.html[here]. The resource requiring editing can be found https://github.com/apache/plc4x/blob/develop/src/site/asciidoc/users/commercial-support.adoc[here]
+
+We will then check if the entry fulfills the requirements and accept the changes as soon as all of these have been addressed.

src/site/site.xml

@@ -49,6 +49,7 @@
     <menu name="Users">
       <item name="Section Home" href="users/index.html"/>
       <item name="Download" href="users/download.html"/>
+      <item name="Adopters" href="users/adopters.html"/>
       <item name="Getting Started" href="users/gettingstarted.html">
         <item name="Java" href="users/plc4j/gettingstarted.html"/>
         <item name="General Concepts" href="users/plc4j/general-concepts.html"/>