This is an automated email from the ASF dual-hosted git repository.
glcj pushed a commit to branch feature/4.4.11
in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/feature/4.4.11 by this push:
new 79ab7ac Fix dummy line. Next error in console in firts deploy.
79ab7ac is described below
commit 79ab7ac32abb168f053af9c5603aebcb1678bfff
Author: glcj <[email protected]>
AuthorDate: Wed Jun 3 00:23:32 2026 -0400
Fix dummy line. Next error in console in firts deploy.
---
.../plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java | 3 ++-
.../src/main/feature/feature.xml | 5 +++--
plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml | 9 ++++++---
.../src/main/resources/etc/config.properties | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java
index 948c177..75024e5 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserSupportImpl.java
@@ -99,7 +99,8 @@ public class MerlotDataBrowserSupportImpl extends
MerlotPvHtcCollectorImpl {
@Override
public void handle(HttpExchange exchange) throws IOException
{
- // Handle the request
+ // Handle the request
+ String response = "uno\r\ndos\r\ntres\r\n";
exchange.sendResponseHeaders(200, response.length());
OutputStream os = exchange.getResponseBody();
os.write(response.getBytes());
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 dce03df..ff0e6d1 100755
---
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,8 +45,9 @@
<!-- Karaf support library -->
<bundle
start-level="30">wrap:mvn:org.apache.karaf/org.apache.karaf.util/${karaf.version}/$Export-Package=*;version="${karaf.version}",!*</bundle>
- <bundle
start-level="30">wrap:mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${karaf.version}/$Export-Package=*;version="${karaf.version}",!*</bundle>
-
+<!-- <bundle
start-level="30">wrap:mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${karaf.version}/$Export-Package=*;version="${karaf.version}",!*</bundle>
+ <bundle
start-level="30">wrap:mvn:org.apache.karaf.shell/org.apache.karaf.shell.commands/${karaf.version}/$Export-Package=*;version="${karaf.version}",!*</bundle>
-->
+
<!-- Mandatory librarys -->
diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
b/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
index fad6ad8..84d0ca4 100644
--- a/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
+++ b/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml
@@ -190,7 +190,7 @@
<installedFeatures>
<feature>wrapper</feature>
<feature>aries-blueprint</feature>
- <feature>shell-compat</feature>
+ <!--<feature>shell-compat</feature>-->
<feature>plc4x-derby</feature>
<feature>plc4x-h2</feature>
<feature>plc4x-uns</feature>
@@ -201,13 +201,14 @@
</startupFeatures>
<bootFeatures>
+
<feature>org.apache.plc4x.merlot.features</feature>
<feature>wrap</feature>
<feature>classpath</feature>
- <feature>shell</feature>
+
<feature>feature</feature>
<feature>jaas</feature>
- <feature>ssh</feature>
+
<feature>management</feature>
<feature>bundle</feature>
<feature>config</feature>
@@ -223,6 +224,8 @@
<feature>aries-blueprint</feature>
<feature>decanter-common</feature>
<feature>decanter-collector-log</feature>
+ <feature>shell</feature>
+ <feature>ssh</feature>
<!--
<feature>decanter-appender-mqtt</feature>
-->
</bootFeatures>
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot/src/main/resources/etc/config.properties
b/plc4j/tools/merlot/org.apache.plc4x.merlot/src/main/resources/etc/config.properties
index 9ada62d..6f6a33e 100755
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot/src/main/resources/etc/config.properties
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot/src/main/resources/etc/config.properties
@@ -320,7 +320,7 @@ 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
+karaf.delay.console=true
#
# Generated command shutdown