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 2022/02/25 12:26:49 UTC

[plc4x] 04/04: fix(build): Streamlined the artifact names of the plc4j examples

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/cleaned-up-type-references
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit f6b466acbd3d26e1e448ee8c325df16a2f9002f4
Author: cdutz <ch...@c-ware.de>
AuthorDate: Fri Feb 25 13:26:32 2022 +0100

    fix(build): Streamlined the artifact names of the plc4j examples
---
 plc4j/examples/hello-cloud-azure/pom.xml              |  2 +-
 plc4j/examples/hello-cloud-google/pom.xml             |  2 +-
 plc4j/examples/hello-connectivity-kafka/pom.xml       |  2 +-
 plc4j/examples/hello-connectivity-mqtt/pom.xml        |  2 +-
 plc4j/examples/hello-discovery/pom.xml                |  2 +-
 plc4j/examples/hello-influx-data-collection/pom.xml   |  2 +-
 plc4j/examples/hello-integration-edgent/pom.xml       |  2 +-
 plc4j/examples/hello-integration-iotdb/pom.xml        |  2 +-
 plc4j/examples/hello-opm/pom.xml                      |  2 +-
 plc4j/examples/hello-webapp/client/pom.xml            |  2 +-
 plc4j/examples/hello-webapp/pom.xml                   |  2 +-
 plc4j/examples/hello-webapp/webapp/pom.xml            |  8 ++++----
 plc4j/examples/hello-webservice/pom.xml               |  2 +-
 plc4j/examples/hello-world-kotlin/pom.xml             |  2 +-
 plc4j/examples/hello-world-plc4x-subscription/pom.xml |  2 +-
 plc4j/examples/hello-world-plc4x-write/pom.xml        |  2 +-
 plc4j/examples/hello-world-plc4x/pom.xml              |  2 +-
 plc4j/examples/plc4j-s7event/pom.xml                  |  3 ++-
 plc4j/examples/poll-loop/pom.xml                      | 13 +++++++------
 19 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/plc4j/examples/hello-cloud-azure/pom.xml b/plc4j/examples/hello-cloud-azure/pom.xml
index 7fba9db..83f1716 100644
--- a/plc4j/examples/hello-cloud-azure/pom.xml
+++ b/plc4j/examples/hello-cloud-azure/pom.xml
@@ -26,7 +26,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-cloud-azure</artifactId>
+  <artifactId>plc4j-examples-hello-cloud-azure</artifactId>
   <name>PLC4J: Examples: Cloud: Azure IoT Hub</name>
   <description>
     Implementation of a PLC4X application gathering information from
diff --git a/plc4j/examples/hello-cloud-google/pom.xml b/plc4j/examples/hello-cloud-google/pom.xml
index 9af0ac6..e745d83 100644
--- a/plc4j/examples/hello-cloud-google/pom.xml
+++ b/plc4j/examples/hello-cloud-google/pom.xml
@@ -26,7 +26,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-cloud-google</artifactId>
+  <artifactId>plc4j-examples-hello-cloud-google</artifactId>
   <name>PLC4J: Examples: Cloud: Google Cloud IoT Core</name>
   <description>
     Implementation of a PLC4X application gathering information from
diff --git a/plc4j/examples/hello-connectivity-kafka/pom.xml b/plc4j/examples/hello-connectivity-kafka/pom.xml
index 1bbc6e7..e382541 100644
--- a/plc4j/examples/hello-connectivity-kafka/pom.xml
+++ b/plc4j/examples/hello-connectivity-kafka/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-connectivity-kafka</artifactId>
+  <artifactId>plc4j-examples-hello-connectivity-kafka</artifactId>
   <name>PLC4J: Examples: Connectivity: Kafka</name>
   <description>Sample application that reads data from a connected PLC and publishes this information to a Kafka topic.</description>
 
diff --git a/plc4j/examples/hello-connectivity-mqtt/pom.xml b/plc4j/examples/hello-connectivity-mqtt/pom.xml
index 9f77351..b6ea96c 100644
--- a/plc4j/examples/hello-connectivity-mqtt/pom.xml
+++ b/plc4j/examples/hello-connectivity-mqtt/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-connectivity-mqtt</artifactId>
+  <artifactId>plc4j-examples-hello-connectivity-mqtt</artifactId>
   <name>PLC4J: Examples: Connectivity: MQTT</name>
   <description>Sample application, that reads data from a connected PLC and publishes this information via MQTT.</description>
 
diff --git a/plc4j/examples/hello-discovery/pom.xml b/plc4j/examples/hello-discovery/pom.xml
index f69e276..ceb1bf9 100644
--- a/plc4j/examples/hello-discovery/pom.xml
+++ b/plc4j/examples/hello-discovery/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-discovery</artifactId>
+  <artifactId>plc4j-examples-hello-discovery</artifactId>
   <name>PLC4J: Examples: Hello Discovery</name>
   <description>Hello world application for PLC4X demonstrating the Discovery API.</description>
 
diff --git a/plc4j/examples/hello-influx-data-collection/pom.xml b/plc4j/examples/hello-influx-data-collection/pom.xml
index 40b265f..e72fb4d 100644
--- a/plc4j/examples/hello-influx-data-collection/pom.xml
+++ b/plc4j/examples/hello-influx-data-collection/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-influx-data-collection</artifactId>
+  <artifactId>plc4j-examples-hello-influx-data-collection</artifactId>
   <name>PLC4J: Examples: Hello InfluxDB Data Collection</name>
   <description>Data Collection with PLC4X and InfluxDB.</description>
 
diff --git a/plc4j/examples/hello-integration-edgent/pom.xml b/plc4j/examples/hello-integration-edgent/pom.xml
index fc28214..0c8dcdf 100644
--- a/plc4j/examples/hello-integration-edgent/pom.xml
+++ b/plc4j/examples/hello-integration-edgent/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-integration-edgent</artifactId>
+  <artifactId>plc4j-examples-hello-integration-edgent</artifactId>
   <name>PLC4J: Examples: Edgent</name>
   <description>Application using Edgent to output PLC data to the console.</description>
 
diff --git a/plc4j/examples/hello-integration-iotdb/pom.xml b/plc4j/examples/hello-integration-iotdb/pom.xml
index f8b201d..17d8727 100644
--- a/plc4j/examples/hello-integration-iotdb/pom.xml
+++ b/plc4j/examples/hello-integration-iotdb/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-integration-iotdb</artifactId>
+  <artifactId>plc4j-examples-hello-integration-iotdb</artifactId>
   <name>PLC4J: Examples: IoTDB</name>
   <description>Application using Edgent to output PLC data to the IoTDB.</description>
 
diff --git a/plc4j/examples/hello-opm/pom.xml b/plc4j/examples/hello-opm/pom.xml
index 87a5d58..e60c709 100644
--- a/plc4j/examples/hello-opm/pom.xml
+++ b/plc4j/examples/hello-opm/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-opm</artifactId>
+  <artifactId>plc4j-examples-hello-opm</artifactId>
   <name>PLC4J: Examples: Hello OPM</name>
   <description>Hello World example of PLC4X using the OPM feature.</description>
 
diff --git a/plc4j/examples/hello-webapp/client/pom.xml b/plc4j/examples/hello-webapp/client/pom.xml
index 0d0eb22..d87a714 100644
--- a/plc4j/examples/hello-webapp/client/pom.xml
+++ b/plc4j/examples/hello-webapp/client/pom.xml
@@ -26,7 +26,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-webapp-client</artifactId>
+  <artifactId>plc4j-examples-hello-webapp-client</artifactId>
   <packaging>swf</packaging>
 
   <name>PLC4J: Examples: Hello-Webapp: Client</name>
diff --git a/plc4j/examples/hello-webapp/pom.xml b/plc4j/examples/hello-webapp/pom.xml
index c03279d..440f72a 100644
--- a/plc4j/examples/hello-webapp/pom.xml
+++ b/plc4j/examples/hello-webapp/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-webapp</artifactId>
+  <artifactId>plc4j-examples-hello-webapp</artifactId>
   <name>PLC4J: Examples: Hello-Webapp (root)</name>
   <packaging>pom</packaging>
 
diff --git a/plc4j/examples/hello-webapp/webapp/pom.xml b/plc4j/examples/hello-webapp/webapp/pom.xml
index 8376152..c8bb2c7 100644
--- a/plc4j/examples/hello-webapp/webapp/pom.xml
+++ b/plc4j/examples/hello-webapp/webapp/pom.xml
@@ -26,7 +26,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-webapp-webapp</artifactId>
+  <artifactId>plc4j-examples-hello-webapp-webapp</artifactId>
   <packaging>war</packaging>
 
   <name>PLC4J: Examples: Hello-Webapp: Spring-Boot WAR</name>
@@ -84,7 +84,7 @@
             <usedDependency>org.springframework.boot:spring-boot-starter-web</usedDependency>
             <usedDependency>org.apache.flex.blazeds:blazeds-spring-boot-starter</usedDependency>
             <usedDependency>org.apache.flex.blazeds:flex-messaging-remoting</usedDependency>
-            <usedDependency>org.apache.plc4x.examples:plc4j-hello-webapp-client</usedDependency>
+            <usedDependency>org.apache.plc4x.examples:plc4j-examples-hello-webapp-client</usedDependency>
             <usedDependency>org.apache.activemq:activemq-client</usedDependency>
           </usedDependencies>
         </configuration>
@@ -233,7 +233,7 @@
 
     <dependency>
       <groupId>org.apache.plc4x.examples</groupId>
-      <artifactId>plc4j-hello-webapp-client</artifactId>
+      <artifactId>plc4j-examples-hello-webapp-client</artifactId>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
@@ -243,7 +243,7 @@
     <dependencies>
       <dependency>
         <groupId>org.apache.plc4x.examples</groupId>
-        <artifactId>plc4j-hello-webapp-client</artifactId>
+        <artifactId>plc4j-examples-hello-webapp-client</artifactId>
         <version>0.10.0-SNAPSHOT</version>
         <type>war</type>
       </dependency>
diff --git a/plc4j/examples/hello-webservice/pom.xml b/plc4j/examples/hello-webservice/pom.xml
index d214940..419c10b 100644
--- a/plc4j/examples/hello-webservice/pom.xml
+++ b/plc4j/examples/hello-webservice/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-webservice</artifactId>
+  <artifactId>plc4j-examples-webservice</artifactId>
   <name>PLC4J: Examples: Hello-Webservice</name>
   <description>Hello world application sending PLC4X data to a remote Webservice.</description>
 
diff --git a/plc4j/examples/hello-world-kotlin/pom.xml b/plc4j/examples/hello-world-kotlin/pom.xml
index dd7c083..9cddd3d 100644
--- a/plc4j/examples/hello-world-kotlin/pom.xml
+++ b/plc4j/examples/hello-world-kotlin/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.re-digital</groupId>
-  <artifactId>plc4x-workshop</artifactId>
+  <artifactId>plc4j-examples-hello-world-kotlin</artifactId>
   <version>1.0-SNAPSHOT</version>
 
   <properties>
diff --git a/plc4j/examples/hello-world-plc4x-subscription/pom.xml b/plc4j/examples/hello-world-plc4x-subscription/pom.xml
index 36d5a9c..bd63a05 100644
--- a/plc4j/examples/hello-world-plc4x-subscription/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-subscription/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-world-plc4x-subscription</artifactId>
+  <artifactId>plc4j-examples-hello-world-plc4x-subscription</artifactId>
   <name>PLC4J: Examples: Hello-World PLC4X (Subscription)</name>
   <description>Hello world application for PLC4X using the subscription API.</description>
 
diff --git a/plc4j/examples/hello-world-plc4x-write/pom.xml b/plc4j/examples/hello-world-plc4x-write/pom.xml
index 9f8ca49..d585549 100644
--- a/plc4j/examples/hello-world-plc4x-write/pom.xml
+++ b/plc4j/examples/hello-world-plc4x-write/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-world-plc4x-write</artifactId>
+  <artifactId>plc4j-examples-hello-world-plc4x-write</artifactId>
   <name>PLC4J: Examples: Hello-World PLC4X (Write)</name>
   <description>Hello world application for PLC4X using the write API.</description>
 
diff --git a/plc4j/examples/hello-world-plc4x/pom.xml b/plc4j/examples/hello-world-plc4x/pom.xml
index 0a30e65..13fd6ab 100644
--- a/plc4j/examples/hello-world-plc4x/pom.xml
+++ b/plc4j/examples/hello-world-plc4x/pom.xml
@@ -27,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-hello-world-plc4x</artifactId>
+  <artifactId>plc4j-examples-hello-world-plc4x</artifactId>
   <name>PLC4J: Examples: Hello-World PLC4X</name>
   <description>Hello world application for PLC4X.</description>
 
diff --git a/plc4j/examples/plc4j-s7event/pom.xml b/plc4j/examples/plc4j-s7event/pom.xml
index 8174204..c6420c4 100644
--- a/plc4j/examples/plc4j-s7event/pom.xml
+++ b/plc4j/examples/plc4j-s7event/pom.xml
@@ -18,6 +18,7 @@
   under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -26,7 +27,7 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-s7event</artifactId>
+  <artifactId>plc4j-examples-s7event</artifactId>
 
   <name>PLC4J: Examples: S7Event example</name>
   <description>Parent of all java based application example modules.
diff --git a/plc4j/examples/poll-loop/pom.xml b/plc4j/examples/poll-loop/pom.xml
index f47b7e8..755b47e 100644
--- a/plc4j/examples/poll-loop/pom.xml
+++ b/plc4j/examples/poll-loop/pom.xml
@@ -1,7 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
   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
@@ -19,6 +17,9 @@
   specific language governing permissions and limitations
   under the License.
   -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.plc4x.examples</groupId>
@@ -26,10 +27,10 @@
     <version>0.10.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>plc4j-poll-loop</artifactId>
+  <artifactId>plc4j-examples-poll-loop</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <name>PLC4J: Examples: Poll Loop Example</name>
-  <description>Fetches data in a continous loop</description>
+  <description>Fetches data in a continuous loop</description>
 
   <properties>
     <app.main.class>org.apache.plc4x.java.examples.helloplc4x.HelloPlc4x</app.main.class>