This is an automated email from the ASF dual-hosted git repository.
cgarcia pushed a commit to branch feature/merlot
in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/feature/merlot by this push:
new c8fff0b Fix several lib version problems.
c8fff0b is described below
commit c8fff0b0ca1b75558448a663348aa2b5cbe51f1d
Author: César García <[email protected]>
AuthorDate: Thu Nov 20 16:06:47 2025 -0400
Fix several lib version problems.
---
.../merlot/org.apache.plc4x.merlot.archive/pom.xml | 18 +-
...ve.cfg => org.apache.plc4x.merlot.archiver.cfg} | 0
.../{archive => archiver}/api/BrokerService.java | 2 +-
.../{archive => archiver}/api/MerlotAppender.java | 2 +-
.../{archive => archiver}/api/MerlotCollector.java | 2 +-
.../api/MerlotDataBrowserSupport.java | 2 +-
.../api/MerlotDecanterFactory.java | 2 +-
.../{archive => archiver}/api/MerlotGPClient.java | 2 +-
.../api/MerlotIoTDBWrapper.java | 2 +-
.../core/MerlotDecanterManagedService.java | 6 +-
.../core/MerlotHtcManagedService.java | 2 +-
.../plc4x/merlot/archiver/impl/BorrarImpl.java | 34 ++
.../impl/BrokerServiceImpl.java | 4 +-
.../impl/MerlotDataBrowserSupportImpl.java | 32 +-
.../impl/MerlotGPClientImpl.java | 4 +-
.../impl/MerlotMqttAppenderFactory.java | 6 +-
.../impl/MerlotMqttAppenderImpl.java | 4 +-
.../impl/MerlotPvHtcCollectorImpl.java | 6 +-
.../impl/MerlotPvRtCollectorImpl.java | 6 +-
.../OSGI-INF/blueprint/decanter-service.xml | 28 +-
.../merlot/org.apache.plc4x.merlot.das.api/pom.xml | 12 +-
.../merlot/org.apache.plc4x.merlot.das.ref/pom.xml | 4 +-
.../merlot/org.apache.plc4x.merlot.das/pom.xml | 2 +-
.../merlot/org.apache.plc4x.merlot.db/pom.xml | 28 +-
.../apache/plc4x/merlot/db/core/DBTestSuite.java | 36 --
.../merlot/org.apache.plc4x.merlot.drv.mb/pom.xml | 4 +-
.../merlot/org.apache.plc4x.merlot.drv.s7/pom.xml | 6 +-
.../org.apache.plc4x.merlot.drv.simulated/pom.xml | 4 +-
.../src/main/feature/feature.xml | 46 +--
.../org.apache.plc4x.merlot/config.properties | 341 +++++++++++++++++++
plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml | 4 +-
plc4j/tools/merlot/pom.xml | 365 ++++++++-------------
32 files changed, 659 insertions(+), 357 deletions(-)
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/pom.xml
index b3f36d5..5e90013 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/pom.xml
@@ -26,12 +26,12 @@
<version>0.13.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.plc4x.merlot.archive</groupId>
- <artifactId>org.apache.plc4x.merlot.archive</artifactId>
+ <groupId>org.apache.plc4x.merlot.archiver</groupId>
+ <artifactId>org.apache.plc4x.merlot.archiver</artifactId>
<version>0.13.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>PLC4J: Merlot :: archive :: Historical archive </name>
+ <name>PLC4J: Merlot :: archiver :: Historical archive </name>
<description>decanter OSGi blueprint bundle project.</description>
<build>
@@ -45,7 +45,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
-
<Export-Package>org.apache.plc4x.merlot.archive*;version=${project.version}</Export-Package>
+
<Export-Package>org.apache.plc4x.merlot.archiver*;version=${project.version}</Export-Package>
<Import-Package>org.epics.gpclient.datasource.sim,
org.epics.gpclient.datasource.pva,
com.sun.net.httpserver.*,
@@ -87,7 +87,7 @@
<type>cfg2</type>
</artifact>
<artifact>
-
<file>src/main/cfg/org.apache.plc4x.merlot.archive.cfg</file>
+
<file>src/main/cfg/org.apache.plc4x.merlot.archiver.cfg</file>
<type>cfg3</type>
</artifact>
</artifacts>
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.plc4x.merlot.scheduler</groupId>
<artifactId>org.apache.plc4x.merlot.scheduler</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -171,5 +171,11 @@
<artifactId>gpclient-core</artifactId>
<version>1.0.8</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.archive.cfg
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.archiver.cfg
similarity index 100%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.archive.cfg
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/cfg/org.apache.plc4x.merlot.archiver.cfg
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/BrokerService.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/BrokerService.java
similarity index 95%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/BrokerService.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/BrokerService.java
index 04e239c..1c64c70 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/BrokerService.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/BrokerService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.api;
+package org.apache.plc4x.merlot.archiver.api;
public interface BrokerService {
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotAppender.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotAppender.java
similarity index 95%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotAppender.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotAppender.java
index e82ae33..8c555f8 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotAppender.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotAppender.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.api;
+package org.apache.plc4x.merlot.archiver.api;
import org.apache.plc4x.merlot.scheduler.api.Job;
import org.osgi.service.cm.ManagedService;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotCollector.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotCollector.java
similarity index 97%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotCollector.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotCollector.java
index b843e32..410cc08 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotCollector.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotCollector.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.api;
+package org.apache.plc4x.merlot.archiver.api;
public interface MerlotCollector {
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotDataBrowserSupport.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDataBrowserSupport.java
similarity index 95%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotDataBrowserSupport.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDataBrowserSupport.java
index c2a21f5..6fb085d 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotDataBrowserSupport.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDataBrowserSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.api;
+package org.apache.plc4x.merlot.archiver.api;
public interface MerlotDataBrowserSupport {
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotDecanterFactory.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDecanterFactory.java
similarity index 95%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotDecanterFactory.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDecanterFactory.java
index 01e6a0f..6f1b6d1 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotDecanterFactory.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotDecanterFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.api;
+package org.apache.plc4x.merlot.archiver.api;
import java.util.Dictionary;
import java.util.Optional;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotGPClient.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotGPClient.java
similarity index 99%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotGPClient.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotGPClient.java
index 8291996..7a42662 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotGPClient.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotGPClient.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.api;
+package org.apache.plc4x.merlot.archiver.api;
import java.util.List;
import java.util.concurrent.Future;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotIoTDBWrapper.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotIoTDBWrapper.java
similarity index 95%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotIoTDBWrapper.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotIoTDBWrapper.java
index e780304..53e5002 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/api/MerlotIoTDBWrapper.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/api/MerlotIoTDBWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.api;
+package org.apache.plc4x.merlot.archiver.api;
public interface MerlotIoTDBWrapper {
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/core/MerlotDecanterManagedService.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterManagedService.java
similarity index 96%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/core/MerlotDecanterManagedService.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterManagedService.java
index 3f8e253..a9ba59b 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/core/MerlotDecanterManagedService.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterManagedService.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.core;
+package org.apache.plc4x.merlot.archiver.core;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Optional;
-import org.apache.plc4x.merlot.archive.api.MerlotAppender;
-import org.apache.plc4x.merlot.archive.api.MerlotDecanterFactory;
+import org.apache.plc4x.merlot.archiver.api.MerlotAppender;
+import org.apache.plc4x.merlot.archiver.api.MerlotDecanterFactory;
import org.apache.plc4x.merlot.scheduler.api.Job;
import org.apache.plc4x.merlot.scheduler.api.JobContext;
import org.apache.plc4x.merlot.scheduler.api.Scheduler;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/core/MerlotHtcManagedService.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java
similarity index 96%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/core/MerlotHtcManagedService.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java
index d6d00e1..c9fe67c 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/core/MerlotHtcManagedService.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.core;
+package org.apache.plc4x.merlot.archiver.core;
import java.util.Dictionary;
import org.osgi.service.cm.ConfigurationException;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BorrarImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BorrarImpl.java
new file mode 100644
index 0000000..22a78c4
--- /dev/null
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BorrarImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt
to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit
this template
+ */
+package org.apache.plc4x.merlot.archiver.impl;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author cgarcia
+ */
+public class BorrarImpl extends HttpServlet{
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
+ try (PrintWriter writer = resp.getWriter()) {
+ writer.println("<html>");
+ writer.println("<head>");
+ writer.println("<title>Example</title>");
+ writer.println("</head>");
+ writer.println("<body align='center'>");
+ writer.println("<h1>Example Servlet</h1>");
+ writer.println("</body>");
+ writer.println("</html>");
+ }
+ }
+
+}
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/BrokerServiceImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java
similarity index 95%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/BrokerServiceImpl.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java
index c909527..01770b4 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/BrokerServiceImpl.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.impl;
+package org.apache.plc4x.merlot.archiver.impl;
import java.util.logging.Level;
-import org.apache.plc4x.merlot.archive.api.BrokerService;
+import org.apache.plc4x.merlot.archiver.api.BrokerService;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttException;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotDataBrowserSupportImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java
similarity index 80%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotDataBrowserSupportImpl.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java
index 514882a..5728ae1 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotDataBrowserSupportImpl.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.impl;
+package org.apache.plc4x.merlot.archiver.impl;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
@@ -22,13 +22,20 @@ import com.sun.net.httpserver.HttpServer;
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetSocketAddress;
-import org.apache.plc4x.merlot.archive.api.MerlotGPClient;
+import java.util.Dictionary;
+import org.apache.plc4x.merlot.archiver.api.MerlotGPClient;
+import org.osgi.service.cm.ManagedServiceFactory;
import org.apache.plc4x.merlot.scheduler.api.Scheduler;
+import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.event.EventAdmin;
import org.slf4j.LoggerFactory;
-
-public class MerlotDataBrowserSupportImpl extends MerlotPvHtcCollectorImpl {
+/**
+ *
+ *
+ * @author cgarcia
+ */
+public class MerlotDataBrowserSupportImpl extends MerlotPvHtcCollectorImpl {
private static final org.slf4j.Logger LOGGER =
LoggerFactory.getLogger(MerlotDataBrowserSupportImpl.class);
@@ -59,6 +66,23 @@ public class MerlotDataBrowserSupportImpl extends
MerlotPvHtcCollectorImpl {
super.stop();
server.stop(10);
}
+
+ @Override
+ public String getName() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void updated(String string, Dictionary<String, ?> dctnr) throws
ConfigurationException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void deleted(String string) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+
// Define a custom HttpHandler
static class MyHandler implements HttpHandler {
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotGPClientImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotGPClientImpl.java
similarity index 98%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotGPClientImpl.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotGPClientImpl.java
index a4acd6a..0857fda 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotGPClientImpl.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotGPClientImpl.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.impl;
+package org.apache.plc4x.merlot.archiver.impl;
import java.time.Duration;
import java.util.List;
import java.util.ServiceLoader;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.apache.plc4x.merlot.archive.api.MerlotGPClient;
+import org.apache.plc4x.merlot.archiver.api.MerlotGPClient;
import org.epics.gpclient.CollectorExpression;
import org.epics.gpclient.Expression;
import org.epics.gpclient.GPClient;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotMqttAppenderFactory.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderFactory.java
similarity index 91%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotMqttAppenderFactory.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderFactory.java
index 4dc29f0..0d6cb4b 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotMqttAppenderFactory.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderFactory.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.impl;
+package org.apache.plc4x.merlot.archiver.impl;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Optional;
-import org.apache.plc4x.merlot.archive.api.MerlotAppender;
-import org.apache.plc4x.merlot.archive.api.MerlotDecanterFactory;
+import org.apache.plc4x.merlot.archiver.api.MerlotAppender;
+import org.apache.plc4x.merlot.archiver.api.MerlotDecanterFactory;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotMqttAppenderImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java
similarity index 98%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotMqttAppenderImpl.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java
index 29897a2..e2b4b4f 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotMqttAppenderImpl.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.impl;
+package org.apache.plc4x.merlot.archiver.impl;
import java.util.logging.Level;
-import org.apache.plc4x.merlot.archive.api.MerlotAppender;
+import org.apache.plc4x.merlot.archiver.api.MerlotAppender;
import org.apache.plc4x.merlot.scheduler.api.JobContext;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotPvHtcCollectorImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java
similarity index 98%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotPvHtcCollectorImpl.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java
index 94f620f..da813cb 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotPvHtcCollectorImpl.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.impl;
+package org.apache.plc4x.merlot.archiver.impl;
import java.io.StringWriter;
import java.time.Duration;
@@ -37,8 +37,8 @@ import javax.json.JsonWriter;
import javax.json.JsonWriterFactory;
import javax.json.stream.JsonGenerator;
import org.apache.commons.lang3.tuple.MutablePair;
-import org.apache.plc4x.merlot.archive.api.MerlotCollector;
-import org.apache.plc4x.merlot.archive.api.MerlotGPClient;
+import org.apache.plc4x.merlot.archiver.api.MerlotCollector;
+import org.apache.plc4x.merlot.archiver.api.MerlotGPClient;
import org.apache.plc4x.merlot.scheduler.api.Job;
import org.apache.plc4x.merlot.scheduler.api.JobContext;
import org.apache.plc4x.merlot.scheduler.api.ScheduleOptions;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotPvRtCollectorImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvRtCollectorImpl.java
similarity index 98%
rename from
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotPvRtCollectorImpl.java
rename to
plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvRtCollectorImpl.java
index 4738933..5936ca1 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archive/impl/MerlotPvRtCollectorImpl.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvRtCollectorImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.plc4x.merlot.archive.impl;
+package org.apache.plc4x.merlot.archiver.impl;
import java.time.Instant;
import java.util.Date;
@@ -27,8 +27,8 @@ import java.util.function.BiConsumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.tuple.MutablePair;
-import org.apache.plc4x.merlot.archive.api.MerlotCollector;
-import org.apache.plc4x.merlot.archive.api.MerlotGPClient;
+import org.apache.plc4x.merlot.archiver.api.MerlotCollector;
+import org.apache.plc4x.merlot.archiver.api.MerlotGPClient;
import org.apache.plc4x.merlot.scheduler.api.Job;
import org.apache.plc4x.merlot.scheduler.api.JobContext;
import org.apache.plc4x.merlot.scheduler.api.ScheduleOptions;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/resources/OSGI-INF/blueprint/decanter-service.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/resources/OSGI-INF/blueprint/decanter-service.xml
index 12623ac..92915b4 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/resources/OSGI-INF/blueprint/decanter-service.xml
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archive/src/main/resources/OSGI-INF/blueprint/decanter-service.xml
@@ -27,7 +27,7 @@
interface="org.osgi.service.event.EventAdmin" availability="mandatory"
timeout="1200"/>
<bean id="MerlotGPClientBean"
- class="org.apache.plc4x.merlot.archive.impl.MerlotGPClientImpl"
+ class="org.apache.plc4x.merlot.archiver.impl.MerlotGPClientImpl"
init-method="init"
destroy-method="destroy"
scope="singleton"
@@ -35,20 +35,20 @@
</bean>
<bean id="MerlotMqttAppenderFactoryBean"
-
class="org.apache.plc4x.merlot.archive.impl.MerlotMqttAppenderFactory"
+
class="org.apache.plc4x.merlot.archiver.impl.MerlotMqttAppenderFactory"
scope="singleton"
activation="eager">
</bean>
<bean id="MerlotDecanterManagedServiceBean"
-
class="org.apache.plc4x.merlot.archive.core.MerlotDecanterManagedService"
+
class="org.apache.plc4x.merlot.archiver.core.MerlotDecanterManagedService"
scope="singleton"
activation="eager">
<argument ref="blueprintBundleContext" />
</bean>
<bean id="MerlotPvHtcCollectorImplBean"
-
class="org.apache.plc4x.merlot.archive.impl.MerlotPvHtcCollectorImpl"
+
class="org.apache.plc4x.merlot.archiver.impl.MerlotPvHtcCollectorImpl"
init-method="init"
scope="singleton"
activation="eager">
@@ -58,7 +58,7 @@
</bean>
<bean id="MerlotPvRtCollectorImplBean"
-
class="org.apache.plc4x.merlot.archive.impl.MerlotPvRtCollectorImpl"
+
class="org.apache.plc4x.merlot.archiver.impl.MerlotPvRtCollectorImpl"
init-method="init"
scope="singleton"
activation="eager">
@@ -68,7 +68,7 @@
</bean>
<bean id="MerlotDataBrowserSupportImplBean"
-
class="org.apache.plc4x.merlot.archive.impl.MerlotDataBrowserSupportImpl"
+
class="org.apache.plc4x.merlot.archiver.impl.MerlotDataBrowserSupportImpl"
init-method="init"
scope="singleton"
activation="eager">
@@ -82,13 +82,13 @@
<service ref="MerlotMqttAppenderFactoryBean" auto-export="interfaces">
<service-properties>
- <entry key="org.plc4x.merlot.archive.factory"
value="mqtt-appender"/>
+ <entry key="org.plc4x.merlot.archiver.factory"
value="mqtt-appender"/>
</service-properties>
</service>
<service ref="MerlotDecanterManagedServiceBean" auto-export="interfaces">
<service-properties>
- <entry key="service.pid" value="org.apache.plc4x.merlot.archive"/>
+ <entry key="service.pid"
value="org.apache.plc4x.merlot.archiver"/>
<entry key="scheduler.name"
value="MerlotDecanterManagedServiceBean"/>
<entry key="scheduler.period" value="5000"/>
<entry key="scheduler.immediate" value="true"/>
@@ -110,8 +110,16 @@
<service ref="MerlotDataBrowserSupportImplBean" auto-export="interfaces">
<service-properties>
- <entry key="service.pid" value="org.apache.plc4x.merlot.archive"/>
+ <entry key="service.pid"
value="org.apache.plc4x.merlot.archiver"/>
</service-properties>
- </service>
+ </service>
+
+ <service interface="javax.servlet.Servlet">
+ <service-properties>
+ <entry key="alias" value="/servlet-example"/>
+ <entry key="servlet-name" value="Example"/>
+ </service-properties>
+ <bean class="org.apache.plc4x.merlot.archiver.impl.BorrarImpl"/>
+ </service>
</blueprint>
\ No newline at end of file
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/pom.xml
index 23e03c4..a471039 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>merlot</artifactId>
- <groupId>org.apache.plc4x</groupId>
- <version>0.13.0-SNAPSHOT</version>
+ <artifactId>merlot</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.plc4x.merlot.api</groupId>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.plc4x.merlot.scheduler</groupId>
<artifactId>org.apache.plc4x.merlot.scheduler</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -201,7 +201,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-spi</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.ref/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.ref/pom.xml
index 5d34fa2..eab2c93 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.ref/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.ref/pom.xml
@@ -81,12 +81,12 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x.merlot.api</groupId>
<artifactId>org.apache.plc4x.merlot.api</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.das/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das/pom.xml
index 1864647..e370de2 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.das/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.das/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>${project.version}</version>
+ <version>${plc4x.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x.merlot.api</groupId>
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.db/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.db/pom.xml
index 553d2bf..8fa9420 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.db/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.db/pom.xml
@@ -108,12 +108,12 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x.merlot.scheduler</groupId>
<artifactId>org.apache.plc4x.merlot.scheduler</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.epics</groupId>
@@ -141,5 +141,29 @@
<artifactId>org.apache.karaf.jaas.modules</artifactId>
<version>4.4.6</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.10.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>5.10.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.10.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opentest4j</groupId>
+ <artifactId>opentest4j</artifactId>
+ <version>1.3.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/test/java/org/apache/plc4x/merlot/db/core/DBTestSuite.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/test/java/org/apache/plc4x/merlot/db/core/DBTestSuite.java
deleted file mode 100644
index 227f74c..0000000
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.db/src/test/java/org/apache/plc4x/merlot/db/core/DBTestSuite.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.plc4x.merlot.db.core;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- *
- * @author cgarcia
- */
-@RunWith(Suite.class)
[email protected]({
- org.apache.plc4x.merlot.db.core.DBBooleanFactoryTest.class
-})
-public class DBTestSuite {
-
-}
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.mb/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.mb/pom.xml
index 5c692de..2b7f96f 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.mb/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.mb/pom.xml
@@ -66,12 +66,12 @@
<dependency>
<groupId>org.apache.plc4x.merlot.api</groupId>
<artifactId>org.apache.plc4x.merlot.api</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-modbus</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/pom.xml
index b0a0b18..6a839f5 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/pom.xml
@@ -104,12 +104,12 @@
<dependency>
<groupId>org.apache.plc4x.merlot.api</groupId>
<artifactId>org.apache.plc4x.merlot.api</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-s7</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -208,7 +208,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-simulated</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.simulated/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.simulated/pom.xml
index daeca44..aebc555 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.simulated/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.simulated/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-simulated</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${plc4x.version}</version>
<type>jar</type>
</dependency>
<dependency>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.plc4x.merlot.api</groupId>
<artifactId>org.apache.plc4x.merlot.api</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
index 480a8cd..870e8cb 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.features/src/main/feature/feature.xml
@@ -45,6 +45,7 @@
<!-- Apache librarys -->
<bundle
start-level="30">wrap:mvn:org.apache.commons/commons-lang3/${commons-lang3.version}/$Export-Package=*;version="${commons-lang3.version}",!*</bundle>
<bundle
start-level="28">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+ <bundle
start-level="28">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle
start-level="28">mvn:commons-net/commons-net/${commons-net.version}</bundle>
<bundle
start-level="28">mvn:org.apache.aries.spifly/org.apache.aries.spifly.static.bundle/${spifly.version}</bundle>
@@ -74,7 +75,8 @@
<bundle
start-level="32">wrap:mvn:org.pcap4j/pcap4j-core/1.8.2/$Bundle-SymbolicName=pcap4j&Bundle-Version=1.8.2&Bundle-ManifestVersion="2"&Export-Package=*;version="1.8.2",!*</bundle>
- <bundle
start-level="28">mvn:javax.annotation/javax.annotation-api/1.3.2</bundle>
+ <bundle
start-level="28">mvn:javax.annotation/javax.annotation-api/1.3.2</bundle>
+ <bundle
start-level="28">mvn:javax.servlet/javax.servlet-api/${javax.servlet.version}</bundle>
<bundle
start-level="28">mvn:org.apache.thrift/libthrift/0.19.0</bundle>
<!--
<bundle>wrap:mvn:com.zaxxer/HikariCP/${hikaricp.version}/$Export-Package=*;version="${hikaricp.version}",!*</bundle>
@@ -85,7 +87,7 @@
<!-- Internal boquer -->
<feature>plc4x-core</feature>
- <feature>plc4x-decanter</feature>
+ <feature>plc4x-archiver</feature>
<!-- Plc4x-Merlot-Core>
1. Driver packages must have a "start-level" greater than 40.
-->
@@ -114,25 +116,25 @@
<feature name="plc4x-core" version="${project.version}">
<feature prerequisite="true">spifly</feature>
<!-- Apache Plc4x - Core -->
- <bundle
start-level="20">mvn:org.apache.plc4x/plc4j-api/${project.version}</bundle>
- <bundle
start-level="22">mvn:org.apache.plc4x/plc4j-spi/${project.version}</bundle>
- <bundle
start-level="24">mvn:org.apache.plc4x/plc4j-osgi/${project.version}</bundle>
+ <bundle
start-level="20">mvn:org.apache.plc4x/plc4j-api/${plc4x.version}</bundle>
+ <bundle
start-level="22">mvn:org.apache.plc4x/plc4j-spi/${plc4x.version}</bundle>
+ <bundle
start-level="24">mvn:org.apache.plc4x/plc4j-osgi/${plc4x.version}</bundle>
</feature>
<feature name="plc4x-drivers" version="${asm.version}">
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-serial/${project.version}</bundle>
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-tcp/${project.version}</bundle>
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-pcap-replay/${project.version}</bundle>
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-pcap-shared/${project.version}</bundle>
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-utils-pcap-replay/${project.version}</bundle>
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-utils-pcap-shared/${project.version}</bundle>
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-raw-socket/${project.version}</bundle>
- <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-utils-raw-sockets/${project.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-serial/${plc4x.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-tcp/${plc4x.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-pcap-replay/${plc4x.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-pcap-shared/${plc4x.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-utils-pcap-replay/${plc4x.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-utils-pcap-shared/${plc4x.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-transport-raw-socket/${plc4x.version}</bundle>
+ <bundle
start-level="40">mvn:org.apache.plc4x/plc4j-utils-raw-sockets/${plc4x.version}</bundle>
<!-- Plc4x - Default driver implementation -->
- <bundle
start-level="80">mvn:org.apache.plc4x/plc4j-driver-simulated/${project.version}</bundle>
- <bundle
start-level="80">mvn:org.apache.plc4x/plc4j-driver-modbus/${project.version}</bundle>
- <bundle
start-level="80">mvn:org.apache.plc4x/plc4j-driver-s7/${project.version}</bundle>
+ <bundle
start-level="80">mvn:org.apache.plc4x/plc4j-driver-simulated/${plc4x.version}</bundle>
+ <bundle
start-level="80">mvn:org.apache.plc4x/plc4j-driver-modbus/${plc4x.version}</bundle>
+ <bundle
start-level="80">mvn:org.apache.plc4x/plc4j-driver-s7/${plc4x.version}</bundle>
<!-- Plc4x - Support services for Plc4x driver implementation -->
<bundle
start-level="90">mvn:org.apache.plc4x.merlot.drv.simulated/org.apache.plc4x.merlot.drv.simulated/${project.version}</bundle>
@@ -231,14 +233,14 @@
<bundle>webbundle:mvn:org.apache.plc4x.merlot.ui/org.apache.plc4x.merlot.ui/${project.version}/war?Web-ContextPath=plc4xui</bundle>
</feature>
- <feature name='plc4x-decanter' description='${project.name}'
version='${project.version}'>
+ <feature name='plc4x-archiver' description='${project.name}'
version='${project.version}'>
<feature>plc4x-epics-gpclient</feature>
<bundle
start-level="30">mvn:org.eclipse.paho/org.eclipse.paho.client.mqttv3/1.2.5</bundle>
- <bundle
start-level="90">mvn:org.apache.plc4x.merlot.decanter/org.apache.plc4x.merlot.decanter/${project.version}</bundle>
- <configfile
finalname="/etc/org.apache.plc4x.merlot.decanter-grafana.cfg">mvn:org.apache.plc4x.merlot.decanter/org.apache.plc4x.merlot.decanter/${project.version}/cfg</configfile>
- <configfile
finalname="/etc/org.apache.plc4x.merlot.decanter-iotdb.cfg">mvn:org.apache.plc4x.merlot.decanter/org.apache.plc4x.merlot.decanter/${project.version}/cfg</configfile>
- <configfile
finalname="/etc/org.apache.plc4x.merlot.pvhtc.cfg">mvn:org.apache.plc4x.merlot.decanter/org.apache.plc4x.merlot.decanter/${project.version}/cfg2</configfile>
- <configfile
finalname="/etc/org.apache.plc4x.merlot.pvrt.cfg">mvn:org.apache.plc4x.merlot.decanter/org.apache.plc4x.merlot.decanter/${project.version}/cfg2</configfile>
+ <bundle
start-level="90">mvn:org.apache.plc4x.merlot.archiver/org.apache.plc4x.merlot.archiver/${project.version}</bundle>
+ <configfile
finalname="/etc/org.apache.plc4x.merlot.decanter-grafana.cfg">mvn:org.apache.plc4x.merlot.archiver/org.apache.plc4x.merlot.archiver/${project.version}/cfg</configfile>
+ <configfile
finalname="/etc/org.apache.plc4x.merlot.decanter-iotdb.cfg">mvn:org.apache.plc4x.merlot.archiver/org.apache.plc4x.merlot.archiver/${project.version}/cfg</configfile>
+ <configfile
finalname="/etc/org.apache.plc4x.merlot.pvhtc.cfg">mvn:org.apache.plc4x.merlot.archiver/org.apache.plc4x.merlot.archiver/${project.version}/cfg2</configfile>
+ <configfile
finalname="/etc/org.apache.plc4x.merlot.pvrt.cfg">mvn:org.apache.plc4x.merlot.archiver/org.apache.plc4x.merlot.archiver/${project.version}/cfg2</configfile>
</feature>
<!--
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot/config.properties
b/plc4j/tools/merlot/org.apache.plc4x.merlot/config.properties
new file mode 100644
index 0000000..c54f1d8
--- /dev/null
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot/config.properties
@@ -0,0 +1,341 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# This file lists Karaf default settings for this particular version of Karaf.
+# For easier maintenance when upgrading Karaf and to better document which
+# default values have changed, it is recommended to place any changes to
+# these values in a custom.properties file in the same folder as this file.
+# Each value specified in custom.properties will override the default value
+# here.
+#
+
+#
+# Properties file inclusions (as a space separated list of relative paths)
+# Included files will override the values specified in this file
+# NB: ${includes} properties files are mandatory, it means that Karaf will not
start
+# if the include file is not found
+#
+${includes} = jre.properties custom.properties
+
+#
+# Properties file inclusions (as a space separated list of relative paths)
+# Included files will override the values specified in this file
+# NB: ${optionals} properties files are optionals, it means that Karaf will
just
+# display a warning message but the bootstrap will be performed
+#
+# ${optionals} = my.properties
+
+#
+# Framework selection properties
+#
+karaf.framework=felix
+
+#
+# Location of the OSGi frameworks
+#
+karaf.framework.equinox=mvn\:org.eclipse.platform/org.eclipse.osgi/3.18.0
+karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/7.0.5
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages= \
+ org.osgi.dto;version="1.1",\
+ org.osgi.resource;version="1.0",\
+ org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
+ org.osgi.framework;version="1.10",\
+ org.osgi.framework.dto;version="1.10";uses:="org.osgi.dto",\
+ org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
+
org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
+ org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\
+
org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",\
+ org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",\
+ org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",\
+ org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\
+ org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\
+
org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\
+
org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto",\
+
org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\
+
org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\
+ org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource",\
+ org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
+ org.osgi.service.url;version="1.0",\
+ org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework",\
+ org.apache.karaf.version;version="4.4.6",\
+
org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="4.4.6",\
+
org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="4.4.6",\
+ org.apache.karaf.info;version="4.4.6",\
+ ${jre-${java.specification.version}}
+
+#
+# Extra packages appended after standard packages
+#
+org.osgi.framework.system.packages.extra = \
+ org.apache.karaf.branding, \
+ sun.misc, \
+ com.sun.jmx.remote.protocol, \
+ com.sun.jmx.remote.protocol.jmxmp, \
+ com.sun.net.httpserver, \
+
org.apache.karaf.jaas.boot;uses:=\"javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework\";version=4.4.6,
\
+
org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=4.4.6, \
+ org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=4.4.6, \
+
org.apache.karaf.diagnostic.core.common;uses:=org.apache.karaf.diagnostic.core;version=4.4.6
+
+org.osgi.framework.system.capabilities= \
+ ${eecap-${java.specification.version}}, \
+ ${${karaf.framework}-capabilities}, \
+ ${karaf-capabilities}
+
+karaf-capabilities= \
+ osgi.service;objectClass:List<String>=org.apache.karaf.info.ServerInfo
+
+felix-capabilities= \
+
osgi.service;objectClass:List<String>=org.osgi.service.packageadmin.PackageAdmin,
\
+ osgi.service;objectClass:List<String>=org.osgi.service.resolver.Resolver, \
+ osgi.service;objectClass:List<String>=org.osgi.service.startlevel.StartLevel
+
+equinox-capabilities= \
+
osgi.service;objectClass:List<String>=java.lang.ClassLoader;equinox.classloader.type=contextClassLoader,
\
+
osgi.service;objectClass:List<String>=javax.xml.parsers.DocumentBuilderFactory,
\
+ osgi.service;objectClass:List<String>=javax.xml.parsers.SAXParserFactory, \
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.framework.log.FrameworkLog,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.framework.log.FrameworkLog;performance=true,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=eclipse.home.location,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.configuration.area,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.install.area,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.instance.area,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.user.area,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.debug.DebugOptions,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.environment.EnvironmentInfo,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.localization.BundleLocalization,
\
+
osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService,org.eclipse.equinox.log.ExtendedLogReaderService",
\
+
osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.eclipse.equinox.log.ExtendedLogService",
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.security.TrustEngine;osgi.signedcontent.trust.engine=org.eclipse.osgi,
\
+
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List<String>="bundleentry,bundleresource"
+
+eecap-21 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0"
+eecap-20 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0"
+eecap-19 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0"
+eecap-18 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0"
+eecap-17 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0"
+eecap-16 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0"
+eecap-15 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0"
+eecap-14 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0"
+eecap-13 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0"
+eecap-11= osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0", \
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0,10.0,11.0"
+eecap-10= osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0", \
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8,9.0,10.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0,10.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0,10.0"
+eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2",
\
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0", \
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8,9.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0"
+eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8", \
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8"
+
+#
+# javax.transaction is needed ONLY for
com.sun.corba.se.impl.javax.rmi.CORBA.Util.mapSystemException().
+# JDK8 and earlier provide only 3 exception classes in this package, so full
JTA API bundles should always try the
+# bootdelegation first - even if they also package (and export)
javax.transaction package
+#
+# boot delegation of javax.transaction.xa is needed to avoid class loader
constraint violation when using javax.sql
+# and this package is always complete in all JDKs
+#
+# javax.security.cert is needed by pax-transx-tm-narayana as it uses
URLClassLoader and otherwise is unable to create
+# object store.
+#
+org.osgi.framework.bootdelegation = \
+ com.sun.*, \
+ javax.transaction, \
+ javax.transaction.xa, \
+ javax.xml.crypto, \
+ javax.xml.crypto.*, \
+ javax.security.cert, \
+ jdk.nashorn.*, \
+ sun.*, \
+ jdk.internal.reflect, \
+ jdk.internal.reflect.*, \
+ org.apache.karaf.jaas.boot, \
+ org.apache.karaf.jaas.boot.principal
+
+# jVisualVM support
+# in order to use Karaf with jvisualvm, the org.osgi.framework.bootdelegation
property has to contain the org.netbeans.lib.profiler.server package
+# and, so, it should look like:
+#
+#
org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom,org.netbeans.lib.profiler.server
+#
+# YourKit support
+# in order to use Karaf with YourKit, the org.osgi.framework.bootdelegation
property has to contain the com.yourkit.* packages
+# and, so, it should look like:
+#
+#
org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom,com.yourkit.*
+#
+
+#
+# Set the parent classloader for the bundle to the classloader that loads the
Framework (i.e. everything in lib/*.jar)
+#
+org.osgi.framework.bundle.parent=framework
+
+#
+# Definition of the default bundle start level
+#
+org.osgi.framework.startlevel.beginning=100
+karaf.startlevel.bundle=80
+
+#
+# The location of the Karaf shutdown port file used to stop instance
+#
+karaf.shutdown.port.file=${karaf.data}/port
+
+#
+# The location of the Karaf pid file
+#
+karaf.pid.file=${karaf.base}/karaf.pid
+
+#
+# Configuration secrets file location
+#
+org.apache.felix.configadmin.plugin.interpolation.secretsdir=${karaf.etc}
+
+#
+# Configuration FileMonitor properties
+#
+felix.fileinstall.enableConfigSave = true
+felix.fileinstall.dir = ${karaf.etc}
+felix.fileinstall.filter = .*\\.(cfg|config|json)
+felix.fileinstall.poll = 1000
+felix.fileinstall.noInitialDelay = true
+felix.fileinstall.log.level = 3
+felix.fileinstall.log.default = jul
+
+# Use cached urls for bundle CodeSource to avoid
+# problems with JCE cached informations, see KARAF-3974
+felix.bundlecodesource.usecachedurls = true
+
+#
+# Delay for writing the framework state to disk in equinox
+# must be >= 1000 and <= 1800000
+#
+eclipse.stateSaveDelayInterval = 1000
+
+#
+# OBR Repository list
+# This property will be modified by the obr:addUrl and obr:removeUrl commands.
+#
+obr.repository.url =
+
+#
+# Start blueprint bundles synchronously when possible
+#
+org.apache.aries.blueprint.synchronous=true
+
+#
+# Do not weave all any classes by default
+#
+org.apache.aries.proxy.weaving.enabled=
+
+#
+# mvn url handler requires config instance configuration
+#
+org.ops4j.pax.url.mvn.requireConfigAdminConfig=true
+
+#
+# Don't delay the console startup. Set to true if you want the console to
start after all other bundles
+#
+karaf.delay.console=false
+
+#
+# Generated command shutdown
+#
+karaf.shutdown.command = b12bf902-20cc-4b0d-91f0-174c396d6fb6
+
+#
+# Enable native Karaf support for systemd's watchdog.
+#
+# In addition to setting the flag to true, the JNA library needs to be made
+# available to the main classloader by adding the two following libraries
+# to the lib/boot directory
+# mvn:net.java.dev.jna/jna/${jna.version}
+# mvn:net.java.dev.jna/jna-platform/${jna.version}
+# or by building a custom distribution and adding the following lines for the
+# karaf maven plugin configuration:
+#
<library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
+#
<library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
+#
+#karaf.systemd.enabled=true
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
index 35f5127..16cdc9a 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.plc4x.merlot.features</groupId>
<artifactId>org.apache.plc4x.merlot.features</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
@@ -182,7 +182,7 @@
<finalName>${project.artifactId}</finalName>
<libraries>
-
<library>mvn:org.apache.plc4x.merlot.branding/org.apache.plc4x.merlot.branding/0.13.0-SNAPSHOT;type:=boot</library>
+
<library>mvn:org.apache.plc4x.merlot.branding/org.apache.plc4x.merlot.branding/${project.version};type:=boot</library>
</libraries>
<installedFeatures>
diff --git a/plc4j/tools/merlot/pom.xml b/plc4j/tools/merlot/pom.xml
index 5b60938..4811139 100644
--- a/plc4j/tools/merlot/pom.xml
+++ b/plc4j/tools/merlot/pom.xml
@@ -16,250 +16,149 @@ software distributed under the License is distributed on
an
KIND, either express or implied. See the License for the
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";>
+-->
+
+<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>
+ <modelVersion>4.0.0</modelVersion>
- <!-- <parent>
+ <!-- <parent>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-integrations</artifactId>
<version>0.13.0-SNAPSHOT</version>
</parent>-->
- <groupId>org.apache.plc4x</groupId>
-
-
- <artifactId>merlot</artifactId>
-
-
- <version>0.13.0-SNAPSHOT</version>
-
-
- <packaging>pom</packaging>
-
- <name>PLC4J: Integrations: Apache Karaf</name>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>merlot</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+ <name>PLC4J: Integrations: Apache Karaf</name>
+ <description>Integration module for integrating PLC4X into Apache
Karaf.</description>
- <description>Integration module for integrating PLC4X into Apache
Karaf.</description>
-
-
- <repositories>
-
- <repository>
-
- <id>gitlab-maven-antlr4</id>
-
-
<url>http://gitlab.devops.aimsites.nl/api/v4/projects/152/packages/maven</url>
-
- </repository>
-
- </repositories>
+ <repositories>
+ <repository>
+ <id>gitlab-maven-antlr4</id>
+
<url>http://gitlab.devops.aimsites.nl/api/v4/projects/152/packages/maven</url>
+ </repository>
+ </repositories>
- <pluginRepositories>
-
- <pluginRepository>
-
- <id>gitlab-maven-antlr4</id>
-
-
<url>http://gitlab.devops.aimsites.nl/api/v4/projects/152/packages/maven</url>
-
- </pluginRepository>
-
- </pluginRepositories>
-
-
-
-
- <properties>
-
- <!-- Inherited -->
-
- <plc4x.version>0.13.0-SNAPSHOT</plc4x.version>
-
- <apache.log4j.version>2.20.0</apache.log4j.version>
-
- <bit-io.version>1.4.3</bit-io.version>
-
- <c3p0.version>0.9.5.5</c3p0.version>
-
- <commons-codec.version>1.18.0</commons-codec.version>
-
- <commons-net.version>3.11.1</commons-net.version>
-
- <commons-lang3.version>3.17.0</commons-lang3.version>
-
- <hikaricp.version>2.7.9</hikaricp.version>
-
- <netty.version>4.1.104.Final</netty.version>
-
- <quartz.version>2.3.2</quartz.version>
-
- <slf4j.version>2.0.3</slf4j.version>
-
- <spifly.version>1.3.6</spifly.version>
-
- <jackson.version>2.19.0</jackson.version>
-
- <jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
-
- <parser-ng.version>0.1.8</parser-ng.version>
-
- <vavr.version>0.10.4</vavr.version>
-
- <logback.version>1.5.3</logback.version>
-
- <aries.spifly.version>1.3.7</aries.spifly.version>
-
- <asm.version>9.6</asm.version>
-
- <artemis.version>2.38.0</artemis.version>
- <awaitility.version>3.1.6</awaitility.version>
- <decanter.version>2.10.0</decanter.version>
- <hawtbuf.version>1.11</hawtbuf.version>
- <hawtdispatch.version>1.22</hawtdispatch.version>
- <mqtt-client.version>1.16</mqtt-client.version>
-
- <!-- Database used in Pax-jdbc -->
-
- <derby.version>10.14.2.0</derby.version>
-
- <h2.version>2.1.210</h2.version>
-
- <sqlite-jdbc.version>3.46.1.0</sqlite-jdbc.version>
-
-
- <!-- Remove GPL licence -->
-
- <javaluator.version>3.0.3</javaluator.version>
-
-
- <!-- Integration version -->
-
- <karaf.version>4.4.6</karaf.version>
-
- <decanter.version>2.10.0</decanter.version>
-
- <org.osgi.core.version>6.0.0</org.osgi.core.version>
-
- <osgi.core.version>8.0.0</osgi.core.version>
-
- <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
-
- <osgi.device.version>1.1.0</osgi.device.version>
-
- <org.osgi.dal.version>1.0.2</org.osgi.dal.version>
-
- <disruptor.version>4.0.0</disruptor.version>
- <maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
-
- <!-- EPICS -->
-
- <epics.core.version>7.0.9</epics.core.version>
-
- <epics.util.version>1.0.7</epics.util.version>
-
- <epics.vtype.version>1.0.7</epics.vtype.version>
- <epics.vtype.json.version>2.9.0</epics.vtype.json.version>
-
- <epics.vtype.all.version>1.0.7</epics.vtype.all.version>
-
- <epics.ntypes.version>0.3.8</epics.ntypes.version>
-
- <epics.jca.version>2.4.8</epics.jca.version>
-
- <epics.pvaccess.version>5.1.8</epics.pvaccess.version>
-
- <epics.pvaclient.version>4.3.2</epics.pvaclient.version>
-
- <epics.pvdata.version>6.1.8</epics.pvdata.version>
-
- <epics.pvdatabase.version>4.3.1</epics.pvdatabase.version>
-
- <epics.gpclient.version>1.0.7</epics.gpclient.version>
-
- <epics.gpclient.core.version>1.0.7</epics.gpclient.core.version>
-
- <epics.gpclient.sim.version>1.0.7</epics.gpclient.sim.version>
-
- <epics.gpclient.loc.version>1.0.7</epics.gpclient.loc.version>
-
- <epics.gpclient.pva.version>1.0.7</epics.gpclient.pva.version>
-
- <epics.gpclient.ca.version>1.0.7</epics.gpclient.ca.version>
-
- <!-- GRPC Service -->
-
- <protobuf.version>3.25.3</protobuf.version>
-
- <proto.google.commons.version>2.29.0</proto.google.commons.version>
-
- <grpc.version>1.62.2</grpc.version>
-
- <guava.android.version>32.1.3-android</guava.android.version>
-
- <errorprone.version>2.23.0</errorprone.version>
-
- <annotations.api.version>6.0.53</annotations.api.version>
-
- <failureaccess.version>1.0.1</failureaccess.version>
-
- <j2objc.version>2.8</j2objc.version>
-
- <jsr305.version>3.0.2</jsr305.version>
-
- <okio.version>3.9.0</okio.version>
-
- <tomcat.annotation.version>6.0.53</tomcat.annotation.version>
-
- <annotation.version>13.0</annotation.version>
-
- <kotlin.version>1.9.21</kotlin.version>
-
-
- </properties>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>gitlab-maven-antlr4</id>
+
<url>http://gitlab.devops.aimsites.nl/api/v4/projects/152/packages/maven</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <properties>
+ <!-- Inherited -->
+ <plc4x.version>0.13.1</plc4x.version>
+ <apache.log4j.version>2.20.0</apache.log4j.version>
+ <bit-io.version>1.4.3</bit-io.version>
+ <c3p0.version>0.9.5.5</c3p0.version>
+ <commons-codec.version>1.19.0</commons-codec.version>
+ <commons-net.version>3.12.0</commons-net.version>
+ <commons-lang3.version>3.20.0</commons-lang3.version>
+ <commons-io.version>2.21.0</commons-io.version>
+ <hikaricp.version>2.7.9</hikaricp.version>
+ <netty.version>4.1.104.Final</netty.version>
+ <quartz.version>2.3.2</quartz.version>
+ <slf4j.version>2.0.3</slf4j.version>
+ <spifly.version>1.3.6</spifly.version>
+ <jackson.version>2.19.0</jackson.version>
+ <jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
+ <parser-ng.version>0.1.8</parser-ng.version>
+ <vavr.version>0.10.4</vavr.version>
+ <logback.version>1.5.3</logback.version>
+ <aries.spifly.version>1.3.7</aries.spifly.version>
+ <asm.version>9.6</asm.version>
+ <artemis.version>2.38.0</artemis.version>
+ <awaitility.version>3.1.6</awaitility.version>
+ <decanter.version>2.10.0</decanter.version>
+ <hawtbuf.version>1.11</hawtbuf.version>
+ <hawtdispatch.version>1.22</hawtdispatch.version>
+ <mqtt-client.version>1.16</mqtt-client.version>
+ <javax.servlet.version>4.0.1</javax.servlet.version>
+
+ <!-- Database used in Pax-jdbc -->
+ <derby.version>10.14.2.0</derby.version>
+ <h2.version>2.1.210</h2.version>
+ <sqlite-jdbc.version>3.46.1.0</sqlite-jdbc.version>
+
+ <!-- Remove GPL licence -->
+ <javaluator.version>3.0.3</javaluator.version>
+
+ <!-- Integration version -->
+ <karaf.version>4.4.6</karaf.version>
+ <decanter.version>2.10.0</decanter.version>
+ <org.osgi.core.version>6.0.0</org.osgi.core.version>
+ <osgi.core.version>8.0.0</osgi.core.version>
+ <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
+ <osgi.device.version>1.1.0</osgi.device.version>
+ <org.osgi.dal.version>1.0.2</org.osgi.dal.version>
+ <disruptor.version>4.0.0</disruptor.version>
+ <maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
+
+ <!-- EPICS -->
+ <epics.core.version>7.0.9</epics.core.version>
+ <epics.util.version>1.0.7</epics.util.version>
+ <epics.vtype.version>1.0.7</epics.vtype.version>
+ <epics.vtype.json.version>2.9.0</epics.vtype.json.version>
+ <epics.vtype.all.version>1.0.7</epics.vtype.all.version>
+ <epics.ntypes.version>0.3.8</epics.ntypes.version>
+ <epics.jca.version>2.4.8</epics.jca.version>
+ <epics.pvaccess.version>5.1.8</epics.pvaccess.version>
+ <epics.pvaclient.version>4.3.2</epics.pvaclient.version>
+ <epics.pvdata.version>6.1.8</epics.pvdata.version>
+ <epics.pvdatabase.version>4.3.1</epics.pvdatabase.version>
+ <epics.gpclient.version>1.0.7</epics.gpclient.version>
+ <epics.gpclient.core.version>1.0.7</epics.gpclient.core.version>
+ <epics.gpclient.sim.version>1.0.7</epics.gpclient.sim.version>
+ <epics.gpclient.loc.version>1.0.7</epics.gpclient.loc.version>
+ <epics.gpclient.pva.version>1.0.7</epics.gpclient.pva.version>
+ <epics.gpclient.ca.version>1.0.7</epics.gpclient.ca.version>
+
+ <!-- GRPC Service -->
+ <protobuf.version>3.25.3</protobuf.version>
+ <proto.google.commons.version>2.29.0</proto.google.commons.version>
+ <grpc.version>1.62.2</grpc.version>
+ <guava.android.version>32.1.3-android</guava.android.version>
+ <errorprone.version>2.23.0</errorprone.version>
+ <annotations.api.version>6.0.53</annotations.api.version>
+ <failureaccess.version>1.0.1</failureaccess.version>
+ <j2objc.version>2.8</j2objc.version>
+ <jsr305.version>3.0.2</jsr305.version>
+ <okio.version>3.9.0</okio.version>
+ <tomcat.annotation.version>6.0.53</tomcat.annotation.version>
+ <annotation.version>13.0</annotation.version>
+ <kotlin.version>1.9.21</kotlin.version>
+ </properties>
- <modules>
-
- <module>org.apache.plc4x.merlot.modbus.dev</module>
-
- <module>org.apache.plc4x.merlot.modbus.svr</module>
-
- <module>org.apache.plc4x.merlot.scheduler</module>
-
- <module>org.apache.plc4x.merlot.branding</module>
-
- <module>org.apache.plc4x.merlot.uns</module>
-
- <module>org.apache.plc4x.merlot.features</module>
-
- <module>org.apache.plc4x.merlot.das</module>
-
- <module>org.apache.plc4x.merlot.modbus.sim</module>
-
- <module>org.apache.plc4x.merlot.db</module>
-
- <module>org.apache.plc4x.merlot.das.api</module>
-
- <module>org.apache.plc4x.merlot.derby</module>
-
- <module>org.apache.plc4x.merlot.h2</module>
-
- <module>org.apache.plc4x.merlot.drv.simulated</module>
-
- <module>org.apache.plc4x.merlot.das.ref</module>
-
- <module>org.apache.plc4x.merlot.grpc</module>
-
- <!-- <module>org.apache.plc4x.merlot.ui</module> -->
-
- <module>org.apache.plc4x.merlot.drv.s7</module>
-
- <module>org.apache.plc4x.merlot.drv.mb</module>
-
- <module>org.apache.plc4x.merlot.decanter</module>
- <module>org.apache.plc4x.merlot</module>
-
- </modules>
+ <modules>
+ <module>org.apache.plc4x.merlot.modbus.dev</module>
+ <module>org.apache.plc4x.merlot.modbus.svr</module>
+ <module>org.apache.plc4x.merlot.scheduler</module>
+ <module>org.apache.plc4x.merlot.branding</module>
+ <module>org.apache.plc4x.merlot.uns</module>
+ <module>org.apache.plc4x.merlot.features</module>
+ <module>org.apache.plc4x.merlot.das</module>
+ <module>org.apache.plc4x.merlot.modbus.sim</module>
+ <module>org.apache.plc4x.merlot.db</module>
+ <module>org.apache.plc4x.merlot.das.api</module>
+ <module>org.apache.plc4x.merlot.derby</module>
+ <module>org.apache.plc4x.merlot.h2</module>
+ <module>org.apache.plc4x.merlot.drv.simulated</module>
+ <module>org.apache.plc4x.merlot.das.ref</module>
+ <module>org.apache.plc4x.merlot.grpc</module>
+ <!-- <module>org.apache.plc4x.merlot.ui</module> -->
+ <module>org.apache.plc4x.merlot.drv.s7</module>
+ <module>org.apache.plc4x.merlot.drv.mb</module>
+ <module>org.apache.plc4x.merlot.archive</module>
+ <module>org.apache.plc4x.merlot</module>
+ </modules>
</project>
