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
commit c9b96b382cc5b54c5d8aae6cf1c0099872548131 Author: César García <[email protected]> AuthorDate: Tue Jun 2 18:46:24 2026 -0400 Migration to 4.4.11. Clean code SOT. --- .../main/java/org/apache/plc4x/dummy/Comando.java | 2 +- .../org.apache.plc4x.merlot.archiver/pom.xml | 24 ++++++++-------- .../MerlotDecanterCollectorLogManagedService.java | 2 -- .../archiver/core/MerlotHtcManagedService.java | 2 +- .../merlot/archiver/impl/BrokerServiceImpl.java | 3 +- .../impl/MerlotDataBrowserIoTDBGetDataPVImpl.java | 1 - .../impl/MerlotDataBrowserRTGetDataPVImpl.java | 1 - .../impl/MerlotDataBrowserSupportImpl.java | 7 +---- .../merlot/archiver/impl/MerlotHtcIoTDBImpl.java | 2 +- .../archiver/impl/MerlotMqttAppenderImpl.java | 1 - .../impl/MerlotPVStructureRtCollector.java | 27 +----------------- .../archiver/impl/MerlotPvHtcCollectorImpl.java | 15 ---------- .../apache/plc4x/merlot/branding/Activator.java | 4 +-- .../merlot/org.apache.plc4x.merlot.das.api/pom.xml | 4 +-- .../merlot/api/impl/PlcGeneralFunctionImpl.java | 5 +--- .../plc4x/merlot/api/impl/PlcSecureBootImpl.java | 3 +- .../apache/plc4x/merlot/das/core/DriverLoader.java | 5 ---- .../merlot/org.apache.plc4x.merlot.db/pom.xml | 10 +++---- .../merlot/decanter/impl/BrokerServiceImpl.java | 1 - .../merlot/org.apache.plc4x.merlot.drv.s7/pom.xml | 2 +- .../plc4x/merlot/drv/s7/impl/S7PlcModelImpl.java | 8 +----- .../org.apache.plc4x.merlot.features/pom.xml | 2 +- .../src/main/feature/feature.xml | 4 +-- .../merlot/org.apache.plc4x.merlot.kafka/pom.xml | 4 +-- .../org.apache.plc4x.merlot.modbus.dev/pom.xml | 6 ++-- .../org.apache.plc4x.merlot.modbus.sim/pom.xml | 6 ++-- .../merlot/org.apache.plc4x.merlot.uns/pom.xml | 6 ++-- plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml | 12 ++++---- .../src/main/resources/etc/config.properties | 12 ++++---- plc4j/tools/merlot/pom.xml | 32 +++++++++++----------- 30 files changed, 73 insertions(+), 140 deletions(-) diff --git a/plc4j/tools/merlot/org.apache.plc4x.dummy/src/main/java/org/apache/plc4x/dummy/Comando.java b/plc4j/tools/merlot/org.apache.plc4x.dummy/src/main/java/org/apache/plc4x/dummy/Comando.java index cfdace9..21d3932 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.dummy/src/main/java/org/apache/plc4x/dummy/Comando.java +++ b/plc4j/tools/merlot/org.apache.plc4x.dummy/src/main/java/org/apache/plc4x/dummy/Comando.java @@ -27,7 +27,7 @@ public class Comando implements Action{ @Override public Object execute() throws Exception { - System.out.println("Ejecuto comando..."); +// System.out.println("Ejecuto comando..."); return null; } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml index 5edea7a..8e04684 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml @@ -178,38 +178,38 @@ <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvaccess</artifactId> - <version>5.1.11-SNAPSHOT</version> + <version>${epics.pvaccess.version}</version> </dependency> <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvdata</artifactId> - <version>6.1.11-SNAPSHOT</version> + <version>${epics.pvdata.version}</version> </dependency> <dependency> <groupId>org.epics</groupId> <artifactId>gpclient</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>${epics.gpclient.version}</version> <type>pom</type> </dependency> <dependency> <groupId>org.epics</groupId> <artifactId>gpclient-pva</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>${epics.gpclient.pva.version}</version> </dependency> <dependency> <groupId>org.epics</groupId> <artifactId>gpclient-sim</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>${epics.gpclient.sim.version}</version> </dependency> <dependency> <groupId>org.epics</groupId> <artifactId>gpclient-core</artifactId> - <version>1.0.8</version> + <version>${epics.gpclient.core.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.17.0</version> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -220,7 +220,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-session</artifactId> - <version>2.0.6</version> + <version>${iotdb.session.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -230,7 +230,7 @@ <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.core</artifactId> - <version>4.4.10</version> + <version>${karaf.version}</version> </dependency> <dependency> <groupId>com.google.protobuf</groupId> @@ -264,12 +264,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.epics</groupId> <artifactId>vtype</artifactId> - <version>1.0.8</version> + <version>${epics.vtype.version}</version> </dependency> <dependency> <groupId>net.jpountz.lz4</groupId> @@ -292,7 +292,7 @@ <dependency> <groupId>org.apache.karaf.decanter</groupId> <artifactId>org.apache.karaf.decanter.api</artifactId> - <version>2.10.0</version> + <version>${decanter.version}</version> <type>bundle</type> </dependency> <dependency> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterCollectorLogManagedService.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterCollectorLogManagedService.java index 9c5c4ee..6393707 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterCollectorLogManagedService.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotDecanterCollectorLogManagedService.java @@ -96,8 +96,6 @@ public class MerlotDecanterCollectorLogManagedService implements ManagedServiceF } } } - - System.out.println("PID: " + pid); } } } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java index c9fe67c..f55c492 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/core/MerlotHtcManagedService.java @@ -25,7 +25,7 @@ public class MerlotHtcManagedService implements ManagedService { @Override public void updated(Dictionary<String, ?> properties) throws ConfigurationException { - System.out.println("CONFIGURING HTC"); +// System.out.println("CONFIGURING HTC"); } } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java index d7a3b8b..a5450b5 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/BrokerServiceImpl.java @@ -35,7 +35,6 @@ public class BrokerServiceImpl implements BrokerService { @Override public void init() { - System.out.println(">>>> Init <"); try { client = new MqttClient("tcp://10.10.1.104:1883", "clientId", new MemoryPersistence()); MqttConnectOptions options = new MqttConnectOptions(); @@ -61,7 +60,7 @@ public class BrokerServiceImpl implements BrokerService { @Override public void destroy() { - System.out.println("Destroy"); + // } } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserIoTDBGetDataPVImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserIoTDBGetDataPVImpl.java index 6b061d6..2b0046c 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserIoTDBGetDataPVImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserIoTDBGetDataPVImpl.java @@ -105,7 +105,6 @@ public class MerlotDataBrowserIoTDBGetDataPVImpl extends HttpServlet { ByteArrayOutputStream bout = new ByteArrayOutputStream(); MerlotPBRawSerializer.serializeIoTDBToPBRaw(values, pv, bout); ByteBuf buf = Unpooled.wrappedBuffer(bout.toByteArray()); -// System.out.println(ByteBufUtil.prettyHexDump(buf)); out.write(bout.toByteArray()); } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserRTGetDataPVImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserRTGetDataPVImpl.java index a83a76b..10e007a 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserRTGetDataPVImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotDataBrowserRTGetDataPVImpl.java @@ -96,7 +96,6 @@ public class MerlotDataBrowserRTGetDataPVImpl extends HttpServlet { ByteArrayOutputStream bout = new ByteArrayOutputStream(); MerlotPBRawSerializer.serializeToPBRaw(values, pv, bout); ByteBuf buf = Unpooled.wrappedBuffer(bout.toByteArray()); - System.out.println(ByteBufUtil.prettyHexDump(buf)); out.write(bout.toByteArray()); } catch (Exception ex){ 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 a38eed0..948c177 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,12 +99,7 @@ public class MerlotDataBrowserSupportImpl extends MerlotPvHtcCollectorImpl { @Override public void handle(HttpExchange exchange) throws IOException { - // Handle the request - System.out.println("Protocol: " + exchange.getProtocol()); - System.out.println("Method : " + exchange.getRequestMethod()); - System.out.println("URI : " + exchange.getRequestURI().toString()); - String response = "uno\r\ndos\r\ntres\r\n"; - + // Handle the request exchange.sendResponseHeaders(200, response.length()); OutputStream os = exchange.getResponseBody(); os.write(response.getBytes()); diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotHtcIoTDBImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotHtcIoTDBImpl.java index 70b0e95..772fa73 100755 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotHtcIoTDBImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotHtcIoTDBImpl.java @@ -85,7 +85,7 @@ public class MerlotHtcIoTDBImpl implements MerlotHtc, ManagedService { .build(); } catch (Exception e) { - System.out.println("Error: " + e.getMessage()); + LOGGER.error(e.getMessage()); } } return null; diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java index 72cef3a..ab4a553 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotMqttAppenderImpl.java @@ -112,7 +112,6 @@ public class MerlotMqttAppenderImpl implements MerlotAppender { public void execute(JobContext context) { if ((null == client) || (!client.isConnected())){ init(); - System.out.println("Iniciando"); } } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPVStructureRtCollector.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPVStructureRtCollector.java index bd0005a..07040b4 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPVStructureRtCollector.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPVStructureRtCollector.java @@ -26,30 +26,18 @@ import java.util.Date; import java.util.Dictionary; import java.util.Enumeration; import java.util.HashMap; -import java.util.Hashtable; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.ToString; import org.apache.commons.collections4.IterableMap; import org.apache.commons.collections4.map.HashedMap; -import org.apache.commons.lang3.tuple.MutablePair; 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; import org.apache.plc4x.merlot.scheduler.api.Scheduler; -import org.epics.gpclient.GPClientInstance; -import org.epics.gpclient.PVEvent; -import org.epics.gpclient.PVEventRecorder; -import org.epics.gpclient.PVReader; import org.epics.pvaccess.ClientFactory; import org.epics.pvaccess.client.Channel; import org.epics.pvaccess.client.ChannelGet; @@ -58,9 +46,7 @@ import org.epics.pvaccess.client.ChannelProvider; import org.epics.pvaccess.client.ChannelProviderRegistryFactory; import org.epics.pvaccess.client.ChannelRequester; import org.epics.pvdata.copy.CreateRequest; -import org.epics.pvdata.factory.ConvertFactory; import org.epics.pvdata.misc.BitSet; -import org.epics.pvdata.pv.Convert; import org.epics.pvdata.pv.MessageType; import org.epics.pvdata.pv.PVBoolean; import org.epics.pvdata.pv.PVByte; @@ -75,16 +61,6 @@ import org.epics.pvdata.pv.PVStructure; import org.epics.pvdata.pv.ScalarType; import org.epics.pvdata.pv.Status; import org.epics.pvdata.pv.Structure; -import static org.epics.vtype.VImageDataType.pvBoolean; -import static org.epics.vtype.VImageDataType.pvByte; -import static org.epics.vtype.VImageDataType.pvDouble; -import static org.epics.vtype.VImageDataType.pvFloat; -import static org.epics.vtype.VImageDataType.pvInt; -import static org.epics.vtype.VImageDataType.pvLong; -import static org.epics.vtype.VImageDataType.pvShort; -import static org.epics.vtype.VImageDataType.pvString; -import org.epics.vtype.VNumber; -import org.epics.vtype.VType; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; import org.slf4j.LoggerFactory; @@ -220,8 +196,7 @@ public class MerlotPVStructureRtCollector implements MerlotCollector, ManagedSer String strObject; String strKey; String strValue; - - System.out.println("Iniciando carga de propiedades"); + configurationChannel.clear(); if (null == properties) { diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java index d7f4760..b68a515 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/src/main/java/org/apache/plc4x/merlot/archiver/impl/MerlotPvHtcCollectorImpl.java @@ -16,12 +16,8 @@ */ package org.apache.plc4x.merlot.archiver.impl; -import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; import java.time.Instant; import java.util.ArrayList; import java.util.Date; @@ -33,14 +29,10 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; 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.iotdb.rpc.IoTDBConnectionException; -import org.apache.iotdb.rpc.StatementExecutionException; -import org.apache.iotdb.session.Session; import org.apache.plc4x.merlot.archiver.api.MerlotCollector; import org.apache.plc4x.merlot.archiver.api.MerlotGPClient; import org.apache.plc4x.merlot.scheduler.api.Job; @@ -49,9 +41,6 @@ import org.apache.plc4x.merlot.scheduler.api.ScheduleOptions; import org.apache.plc4x.merlot.scheduler.api.Scheduler; import org.apache.tsfile.enums.TSDataType; -import org.apache.tsfile.exception.write.WriteProcessException; -import org.apache.tsfile.file.metadata.IDeviceID; -import static org.apache.tsfile.file.metadata.IDeviceID.LOGGER; import org.apache.tsfile.file.metadata.enums.CompressionType; import org.apache.tsfile.file.metadata.enums.TSEncoding; import org.apache.tsfile.read.TsFileReader; @@ -64,13 +53,10 @@ import org.apache.tsfile.write.TsFileWriter; import org.apache.tsfile.write.record.TSRecord; import org.apache.tsfile.write.record.datapoint.DataPoint; import org.apache.tsfile.write.record.datapoint.DoubleDataPoint; -import org.apache.tsfile.write.record.datapoint.LongDataPoint; import org.apache.tsfile.write.schema.MeasurementSchema; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; -import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttCallbackExtended; -import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; @@ -82,7 +68,6 @@ import org.epics.gpclient.PVReaderListener; import org.epics.vtype.VNumber; import org.epics.vtype.VType; import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedServiceFactory; import org.slf4j.LoggerFactory; diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.branding/src/main/java/org/apache/plc4x/merlot/branding/Activator.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.branding/src/main/java/org/apache/plc4x/merlot/branding/Activator.java index 2463998..843c264 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.branding/src/main/java/org/apache/plc4x/merlot/branding/Activator.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.branding/src/main/java/org/apache/plc4x/merlot/branding/Activator.java @@ -22,11 +22,11 @@ import org.osgi.framework.BundleContext; public class Activator implements BundleActivator { public void start(BundleContext context) { - System.out.println("Starting the bundle"); +// System.out.println("Starting the bundle"); } public void stop(BundleContext context) { - System.out.println("Stopping the bundle"); +// System.out.println("Stopping the bundle"); } } \ 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 d106edb..54a939d 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 @@ -197,7 +197,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.14.0</version> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>org.apache.plc4x</groupId> @@ -212,7 +212,7 @@ <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvdata</artifactId> - <version>6.1.11-SNAPSHOT</version> + <version>${epics.pvdata.version}</version> <type>jar</type> </dependency> <dependency> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcGeneralFunctionImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcGeneralFunctionImpl.java index ee992e2..6eae991 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcGeneralFunctionImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcGeneralFunctionImpl.java @@ -819,10 +819,7 @@ public class PlcGeneralFunctionImpl implements PlcGeneralFunction { @Override public Optional<PlcGroup> getPlcItemGroup(UUID item_uid) { - getPlcGroups().keySet().stream().forEach(u -> { - System.out.println(u); - System.out.println(getPlcGroup(u).getItems().size()); - }); + Optional<UUID> optGroupUuid = getPlcGroups(). keySet(). stream(). diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcSecureBootImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcSecureBootImpl.java index 66f1d0d..b2c9f1f 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcSecureBootImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/impl/PlcSecureBootImpl.java @@ -225,8 +225,7 @@ public class PlcSecureBootImpl implements PlcSecureBoot, Job { } } } - } else { - System.out.println("> " + System.currentTimeMillis()); + } else { delayed++; } } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.das/src/main/java/org/apache/plc4x/merlot/das/core/DriverLoader.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.das/src/main/java/org/apache/plc4x/merlot/das/core/DriverLoader.java index 96fcf32..a1fc017 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.das/src/main/java/org/apache/plc4x/merlot/das/core/DriverLoader.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.das/src/main/java/org/apache/plc4x/merlot/das/core/DriverLoader.java @@ -142,14 +142,9 @@ public class DriverLoader try { InputStream in = locator.loadDriver( driverId ); - // System.out.println(driverId + ", " + locator + " returned: " + - // in); Bundle driverBundle = m_context.installBundle( DRIVER_LOCATION_PREFIX + driverId, in ); - driverBundle.start(); - ServiceReference[] refs = driverBundle.getRegisteredServices(); - driverRefs.addAll( Arrays.asList( refs ) ); // keep track of them locally m_loadedDrivers.addAll( Arrays.asList( refs ) ); 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 0347d40..82bd606 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.db/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.db/pom.xml @@ -118,18 +118,18 @@ <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> <type>jar</type> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.config</artifactId> - <version>4.4.6</version> + <version>${karaf.version}</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.modules</artifactId> - <version>4.4.6</version> + <version>${karaf.version}</version> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> @@ -158,12 +158,12 @@ <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvaccess</artifactId> - <version>5.1.11-SNAPSHOT</version> + <version>${epics.pvaccess.version}</version> </dependency> <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvdata</artifactId> - <version>6.1.11-SNAPSHOT</version> + <version>${epics.pvdata.version}</version> </dependency> </dependencies> </project> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.decanter/src/main/java/org/apache/plc4x/merlot/decanter/impl/BrokerServiceImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.decanter/src/main/java/org/apache/plc4x/merlot/decanter/impl/BrokerServiceImpl.java index 3a55312..6a028c5 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.decanter/src/main/java/org/apache/plc4x/merlot/decanter/impl/BrokerServiceImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.decanter/src/main/java/org/apache/plc4x/merlot/decanter/impl/BrokerServiceImpl.java @@ -36,7 +36,6 @@ public class BrokerServiceImpl implements BrokerService { @Override public void init() { - System.out.println(">>>> Init <"); try { client = new MqttClient("tcp://10.10.1.104:1883", "clientId", new MemoryPersistence()); MqttConnectOptions options = new MqttConnectOptions(); 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 6a839f5..8c7bd9b 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 @@ -173,7 +173,7 @@ <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.core</artifactId> - <version>${dependency.karaf.version}</version> + <version>${karaf.version}</version> <scope>test</scope> </dependency> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/main/java/org/apache/plc4x/merlot/drv/s7/impl/S7PlcModelImpl.java b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/main/java/org/apache/plc4x/merlot/drv/s7/impl/S7PlcModelImpl.java index 39d5055..c0007e3 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/main/java/org/apache/plc4x/merlot/drv/s7/impl/S7PlcModelImpl.java +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/main/java/org/apache/plc4x/merlot/drv/s7/impl/S7PlcModelImpl.java @@ -111,7 +111,6 @@ public class S7PlcModelImpl implements PlcModel { String[] strTemp = pvId.split(":", 2); String strTag = strTemp[1]; - System.out.println("Paso: 01"); //TODO: Split the Device name. S7Tag s7tag = S7Tag.of(strTag); @@ -121,7 +120,6 @@ public class S7PlcModelImpl implements PlcModel { logger.info("Created memmory area with PlcItem: " + "s7 " + s7tag.getMemoryArea().getShortName() + "["+s7tag.getBlockNumber() +"]"); } - System.out.println("Paso: 02"); final Map<Integer, PlcItem> memoryBytes = memoryAreas.get(s7tag.getMemoryArea().getShortName()); if (null == memoryBytes.get(s7tag.getBlockNumber())) { @@ -133,14 +131,11 @@ public class S7PlcModelImpl implements PlcModel { memoryBytes.put(s7tag.getBlockNumber(), plcItem); } - System.out.println("Paso: 03"); final PlcItem internalPlcItem = memoryBytes.get(s7tag.getBlockNumber()); final ByteBuf byteBuf = internalPlcItem.getItemByteBuf(); int bufferSize = (dbrecord.getInnerBuffer().isPresent())?dbrecord.getInnerBuffer().get().capacity():1; int minSize = s7tag.getByteOffset() + bufferSize; - System.out.println("Paso: 04"); - if (byteBuf.capacity() < minSize) { byteBuf.capacity(minSize); logger.info("The buffer capacity was expanded to {}.", minSize); @@ -148,9 +143,8 @@ public class S7PlcModelImpl implements PlcModel { byteBuf.writerIndex(byteBuf.capacity()); System.out.println(ByteBufUtil.prettyHexDump(byteBuf)); - System.out.println("Paso: 05"); doUpdateByteBuf(dbrecord); - System.out.println("Paso: 06"); + } } diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.features/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.features/pom.xml index 0d0c307..cc28a48 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.features/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.features/pom.xml @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> - <version>4.4.5</version> + <version>${karaf.version}</version> <extensions>true</extensions> </plugin> </plugins> 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 cfc10e8..dce03df 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 @@ -83,7 +83,7 @@ <bundle start-level="30">wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}/$Export-Package=*;version="${jackson.version}",!*</bundle> <bundle start-level="30">wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}/$Export-Package=*;version="${jackson.version}",!*</bundle> - <bundle start-level="28">mvn:org.ops4j.pax.logging/pax-logging-api/2.2.3</bundle> + <bundle start-level="28">mvn:org.ops4j.pax.logging/pax-logging-api/2.3.3</bundle> <bundle start-level="28">mvn:com.lmax/disruptor/${disruptor.version}</bundle> <bundle start-level="28">mvn:org.osgi/org.osgi.service.dal/${org.osgi.dal.version}</bundle> @@ -731,7 +731,7 @@ <feature name='plc4x-kafka' description='${project.name}' version='${project.version}'> <bundle start-level="10">wrap:mvn:org.apache.kafka/kafka-clients/${kafka.version}/$Bundle-SymbolicName=kafka-client&Bundle-Version=${kafka.version}&Bundle-ManifestVersion="2"&Export-Package=*;version="${kafka.version}",!*</bundle> - <bundle start-level="10">wrap:mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.utils/2.12.0/$Bundle-SymbolicName=decanter-collector-utils&Bundle-Version=2.12.0&Bundle-ManifestVersion="2"&Export-Package=*;version="2.12.0",!*</bundle> + <bundle start-level="10">wrap:mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.utils/${decanter.version}/$Bundle-SymbolicName=decanter-collector-utils&Bundle-Version=${decanter.version}&Bundle-ManifestVersion="2"&Export-Package=*;version="${decanter.version}",!*</bundle> <bundle start-level="30">mvn:org.apache.plc4x.merlot.kafka/org.apache.plc4x.merlot.kafka/${project.version}</bundle> <configfile finalname="/etc/org.apache.plc4x.merlot.kafka.collector-alarm.cfg">mvn:org.apache.plc4x.merlot.kafka/org.apache.plc4x.merlot.kafka/${project.version}/cfg</configfile> </feature> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.kafka/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.kafka/pom.xml index ad3e576..d3d44e0 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.kafka/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.kafka/pom.xml @@ -126,12 +126,12 @@ <dependency> <groupId>org.apache.karaf.decanter</groupId> <artifactId>org.apache.karaf.decanter.api</artifactId> - <version>2.12.0</version> + <version>${decanter.version}</version> </dependency> <dependency> <groupId>org.apache.karaf.decanter.collector</groupId> <artifactId>org.apache.karaf.decanter.collector.utils</artifactId> - <version>2.12.0</version> + <version>${decanter.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.dev/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.dev/pom.xml index a9605b3..a522c52 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.dev/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.dev/pom.xml @@ -101,17 +101,17 @@ <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.core</artifactId> - <version>4.4.6</version> + <version>${karaf.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> <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvdata</artifactId> - <version>6.1.11-SNAPSHOT</version> + <version>${epics.pvdata.version}</version> </dependency> </dependencies> </project> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.sim/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.sim/pom.xml index b096f81..6e86606 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.sim/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.modbus.sim/pom.xml @@ -97,12 +97,12 @@ or generating noise in a range.</description> <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.apache.plc4x.merlot.modbus.dev</groupId> <artifactId>org.apache.plc4x.merlot.modbus.dev</artifactId> - <version>0.13.0-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.osgi</groupId> @@ -128,7 +128,7 @@ or generating noise in a range.</description> <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvdata</artifactId> - <version>6.1.11-SNAPSHOT</version> + <version>${epics.pvdata.version}</version> </dependency> </dependencies> </project> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml index d72ecb9..beb8278 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot.uns/pom.xml @@ -172,7 +172,7 @@ <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvaccess</artifactId> - <version>5.1.11-SNAPSHOT</version> + <version>${epics.pvaccess.version}</version> </dependency> <dependency> <groupId>org.epics</groupId> @@ -309,7 +309,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.17.0</version> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>org.apache.aries.spifly</groupId> @@ -370,7 +370,7 @@ <dependency> <groupId>org.epics</groupId> <artifactId>epics-pvdata</artifactId> - <version>6.1.11-SNAPSHOT</version> + <version>${epics.pvdata.version}</version> </dependency> </dependencies> </project> diff --git a/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml b/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml index d042bb5..fad6ad8 100644 --- a/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml +++ b/plc4j/tools/merlot/org.apache.plc4x.merlot/pom.xml @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>framework</artifactId> - <version>4.4.6</version> + <version>${karaf.version}</version> <type>kar</type> <exclusions> <exclusion> @@ -89,14 +89,14 @@ <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>standard</artifactId> - <version>4.4.6</version> + <version>${karaf.version}</version> <classifier>features</classifier> <type>xml</type> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>spring</artifactId> - <version>4.4.6</version> + <version>${karaf.version}</version> <classifier>features</classifier> <type>xml</type> <scope>runtime</scope> @@ -104,7 +104,7 @@ <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>enterprise</artifactId> - <version>4.4.6</version> + <version>${karaf.version}</version> <classifier>features</classifier> <type>xml</type> <scope>runtime</scope> @@ -153,7 +153,7 @@ <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> - <version>4.4.6</version> + <version>${karaf.version}</version> <extensions>true</extensions> </plugin> </plugins> @@ -226,7 +226,7 @@ <!-- <feature>decanter-appender-mqtt</feature> --> </bootFeatures> - <javase>1.8</javase> + <javase>11</javase> <generateConsistencyReport>${project.build.directory}</generateConsistencyReport> <consistencyReportProjectName>Apache Karaf (full)</consistencyReportProjectName> 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 247cd70..9ada62d 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 @@ -78,10 +78,10 @@ org.osgi.framework.system.packages= \ 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.version;version="4.4.11",\ + org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="4.4.11",\ 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",\ + org.apache.karaf.info;version="4.4.11",\ ${jre-${java.specification.version}} # @@ -96,9 +96,9 @@ org.osgi.framework.system.packages.extra = \ com.sun.management, \ java.nio.file.spi, \ 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.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=4.4.11, \ + org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=4.4.11, \ + org.apache.karaf.diagnostic.core.common;uses:=org.apache.karaf.diagnostic.core;version=4.4.11 org.osgi.framework.system.capabilities= \ ${eecap-${java.specification.version}}, \ diff --git a/plc4j/tools/merlot/pom.xml b/plc4j/tools/merlot/pom.xml index 3e333ea..7fc005a 100644 --- a/plc4j/tools/merlot/pom.xml +++ b/plc4j/tools/merlot/pom.xml @@ -75,7 +75,7 @@ under the License. <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> + <decanter.version>2.12.0</decanter.version> <hawtbuf.version>1.11</hawtbuf.version> <hawtdispatch.version>1.22</hawtdispatch.version> <mqtt-client.version>1.16</mqtt-client.version> @@ -90,8 +90,8 @@ under the License. <javaluator.version>3.0.3</javaluator.version> <!-- Integration version --> - <karaf.version>4.4.10</karaf.version> - <decanter.version>2.10.0</decanter.version> + <karaf.version>4.4.11</karaf.version> + <decanter.version>2.12.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> @@ -109,16 +109,16 @@ under the License. <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.11-SNAPSHOT</epics.pvaccess.version> + <epics.pvaccess.version>5.1.9</epics.pvaccess.version> <epics.pvaclient.version>4.3.2</epics.pvaclient.version> - <epics.pvdata.version>6.1.11-SNAPSHOT</epics.pvdata.version> + <epics.pvdata.version>6.1.9</epics.pvdata.version> <epics.pvdatabase.version>4.3.1</epics.pvdatabase.version> - <epics.gpclient.version>1.0.10-SNAPSHOT</epics.gpclient.version> - <epics.gpclient.core.version>1.0.9</epics.gpclient.core.version> - <epics.gpclient.sim.version>1.0.10-SNAPSHOT</epics.gpclient.sim.version> - <epics.gpclient.loc.version>1.0.10-SNAPSHOT</epics.gpclient.loc.version> - <epics.gpclient.pva.version>1.0.10-SNAPSHOT</epics.gpclient.pva.version> - <epics.gpclient.ca.version>1.0.10-SNAPSHOT</epics.gpclient.ca.version> + <epics.gpclient.version>1.0.8</epics.gpclient.version> + <epics.gpclient.core.version>1.0.8</epics.gpclient.core.version> + <epics.gpclient.sim.version>1.0.8</epics.gpclient.sim.version> + <epics.gpclient.loc.version>1.0.8</epics.gpclient.loc.version> + <epics.gpclient.pva.version>1.0.8</epics.gpclient.pva.version> + <epics.gpclient.ca.version>1.0.8</epics.gpclient.ca.version> <!-- GRPC Service --> <protobuf.version>4.31.1</protobuf.version> @@ -136,11 +136,11 @@ under the License. <annotation.version>13.0</annotation.version> <kotlin.version>1.9.21</kotlin.version> - <!-- IoTDB --> - <iotdb.session.version>2.0.7</iotdb.session.version> - <tsfile.version>2.2.1</tsfile.version> - <lz4.versio>1.3.0</lz4.versio> - <thrift.version>0.13.0</thrift.version> + <!-- IoTDB --> + <iotdb.session.version>2.0.7</iotdb.session.version> + <tsfile.version>2.2.1</tsfile.version> + <lz4.versio>1.3.0</lz4.versio> + <thrift.version>0.13.0</thrift.version> </properties>
