This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 77ab1b8297e3 Deprecate component IEC 60870
77ab1b8297e3 is described below
commit 77ab1b8297e34b8f7c4cfdbc105588be9478093a
Author: Aurélien Pupier <[email protected]>
AuthorDate: Tue May 12 15:45:16 2026 +0200
Deprecate component IEC 60870
The library used to implement it NeoScada is no more maintained since
2021. There are no alternatives in Java with compatible license.
Signed-off-by: Aurélien Pupier <[email protected]>
---
.../org/apache/camel/catalog/components/iec60870-client.json | 2 +-
.../org/apache/camel/catalog/components/iec60870-server.json | 2 +-
components/camel-iec60870/pom.xml | 2 +-
.../apache/camel/component/iec60870/client/iec60870-client.json | 2 +-
.../apache/camel/component/iec60870/server/iec60870-server.json | 2 +-
.../META-INF/services/org/apache/camel/component.properties | 2 +-
.../camel-iec60870/src/main/docs/iec60870-client-component.adoc | 5 +++--
.../camel-iec60870/src/main/docs/iec60870-server-component.adoc | 5 +++--
.../camel/component/iec60870/AbstractConnectionMultiplexor.java | 1 +
.../org/apache/camel/component/iec60870/AbstractIecComponent.java | 1 +
.../org/apache/camel/component/iec60870/AbstractIecEndpoint.java | 1 +
.../main/java/org/apache/camel/component/iec60870/BaseOptions.java | 1 +
.../java/org/apache/camel/component/iec60870/ConnectionId.java | 1 +
.../main/java/org/apache/camel/component/iec60870/Constants.java | 1 +
.../apache/camel/component/iec60870/DiscardAckChannelHandler.java | 1 +
.../java/org/apache/camel/component/iec60870/DiscardAckModule.java | 1 +
.../java/org/apache/camel/component/iec60870/ObjectAddress.java | 1 +
.../apache/camel/component/iec60870/client/ClientComponent.java | 1 +
.../apache/camel/component/iec60870/client/ClientConnection.java | 1 +
.../component/iec60870/client/ClientConnectionMultiplexor.java | 1 +
.../org/apache/camel/component/iec60870/client/ClientConsumer.java | 1 +
.../org/apache/camel/component/iec60870/client/ClientEndpoint.java | 1 +
.../org/apache/camel/component/iec60870/client/ClientOptions.java | 1 +
.../org/apache/camel/component/iec60870/client/ClientProducer.java | 1 +
.../apache/camel/component/iec60870/server/ServerComponent.java | 1 +
.../component/iec60870/server/ServerConnectionMultiplexor.java | 1 +
.../org/apache/camel/component/iec60870/server/ServerConsumer.java | 1 +
.../org/apache/camel/component/iec60870/server/ServerEndpoint.java | 1 +
.../org/apache/camel/component/iec60870/server/ServerInstance.java | 1 +
.../org/apache/camel/component/iec60870/server/ServerOptions.java | 1 +
.../org/apache/camel/component/iec60870/server/ServerProducer.java | 1 +
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc | 7 ++++++-
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 4 ++++
.../camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java | 3 +++
.../camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java | 3 +++
35 files changed, 51 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json
index 90893dd72bed..f8cf248bc885 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json
@@ -4,7 +4,7 @@
"name": "iec60870-client",
"title": "IEC 60870 Client",
"description": "IEC 60870 supervisory control and data acquisition (SCADA)
client using NeoSCADA implementation.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.client.ClientComponent",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json
index 7b6cade8f9a0..ad0835cc29a1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json
@@ -4,7 +4,7 @@
"name": "iec60870-server",
"title": "IEC 60870 Server",
"description": "IEC 60870 supervisory control and data acquisition (SCADA)
server using NeoSCADA implementation.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.server.ServerComponent",
diff --git a/components/camel-iec60870/pom.xml
b/components/camel-iec60870/pom.xml
index 9af4e1d63d39..1c94236997ab 100644
--- a/components/camel-iec60870/pom.xml
+++ b/components/camel-iec60870/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-iec60870</artifactId>
<packaging>jar</packaging>
- <name>Camel :: IEC 60870</name>
+ <name>Camel :: IEC 60870 (deprecated)</name>
<description>Camel IEC 60870-5-104 support</description>
<properties>
diff --git
a/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/client/iec60870-client.json
b/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/client/iec60870-client.json
index 90893dd72bed..f8cf248bc885 100644
---
a/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/client/iec60870-client.json
+++
b/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/client/iec60870-client.json
@@ -4,7 +4,7 @@
"name": "iec60870-client",
"title": "IEC 60870 Client",
"description": "IEC 60870 supervisory control and data acquisition (SCADA)
client using NeoSCADA implementation.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.client.ClientComponent",
diff --git
a/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/server/iec60870-server.json
b/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/server/iec60870-server.json
index 7b6cade8f9a0..ad0835cc29a1 100644
---
a/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/server/iec60870-server.json
+++
b/components/camel-iec60870/src/generated/resources/META-INF/org/apache/camel/component/iec60870/server/iec60870-server.json
@@ -4,7 +4,7 @@
"name": "iec60870-server",
"title": "IEC 60870 Server",
"description": "IEC 60870 supervisory control and data acquisition (SCADA)
server using NeoSCADA implementation.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.server.ServerComponent",
diff --git
a/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/component.properties
b/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index c2ab241df29b..1ceeea795fbd 100644
---
a/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++
b/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -3,5 +3,5 @@ components=iec60870-client iec60870-server
groupId=org.apache.camel
artifactId=camel-iec60870
version=4.21.0-SNAPSHOT
-projectName=Camel :: IEC 60870
+projectName=Camel :: IEC 60870 (deprecated)
projectDescription=Camel IEC 60870-5-104 support
diff --git
a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
index 994784749c8c..33907d92a1a9 100644
--- a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
+++ b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
@@ -1,10 +1,11 @@
-= IEC 60870 Client Component
+= IEC 60870 Client Component (deprecated)
:doctitle: IEC 60870 Client
:shortname: iec60870-client
:artifactid: camel-iec60870
:description: IEC 60870 supervisory control and data acquisition (SCADA)
client using NeoSCADA implementation.
:since: 2.20
-:supportlevel: Stable
+:supportlevel: Stable-deprecated
+:deprecated: *deprecated*
:tabs-sync-option:
:component-header: Both producer and consumer are supported
//Manually maintained attributes
diff --git
a/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
b/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
index f2d4561f5b9a..3e80871642d4 100644
--- a/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
+++ b/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
@@ -1,10 +1,11 @@
-= IEC 60870 Server Component
+= IEC 60870 Server Component (deprecated)
:doctitle: IEC 60870 Server
:shortname: iec60870-server
:artifactid: camel-iec60870
:description: IEC 60870 supervisory control and data acquisition (SCADA)
server using NeoSCADA implementation.
:since: 2.20
-:supportlevel: Stable
+:supportlevel: Stable-deprecated
+:deprecated: *deprecated*
:tabs-sync-option:
:component-header: Both producer and consumer are supported
//Manually maintained attributes
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractConnectionMultiplexor.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractConnectionMultiplexor.java
index 5025f11518ed..ec13db8669f4 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractConnectionMultiplexor.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractConnectionMultiplexor.java
@@ -25,6 +25,7 @@ import org.apache.camel.RuntimeCamelException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated(since = "4.21")
public abstract class AbstractConnectionMultiplexor {
private static final Logger LOG =
LoggerFactory.getLogger(AbstractConnectionMultiplexor.class);
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
index b78e1c320768..9fee4edaabd3 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
+@Deprecated(since = "4.21")
public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>>
extends DefaultComponent {
private static final Logger LOG =
LoggerFactory.getLogger(AbstractIecComponent.class);
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecEndpoint.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecEndpoint.java
index c1b59f27cdbd..52130372bb95 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecEndpoint.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecEndpoint.java
@@ -30,6 +30,7 @@ import
org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions;
import static java.util.Objects.requireNonNull;
+@Deprecated(since = "4.21")
public abstract class AbstractIecEndpoint<T extends
AbstractConnectionMultiplexor> extends DefaultEndpoint {
/**
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/BaseOptions.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/BaseOptions.java
index 9c30d4a2fe15..f6350943387c 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/BaseOptions.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/BaseOptions.java
@@ -27,6 +27,7 @@ import
org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType;
import org.eclipse.neoscada.protocol.iec60870.ProtocolOptions;
@UriParams
+@Deprecated(since = "4.21")
public abstract class BaseOptions<T extends BaseOptions<T>> {
/**
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ConnectionId.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ConnectionId.java
index 595dfda3ebac..09b17312ccb8 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ConnectionId.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ConnectionId.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.iec60870;
import java.util.Objects;
+@Deprecated(since = "4.21")
public class ConnectionId {
private final String host;
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/Constants.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/Constants.java
index 307f4ca20ce0..23b5a3b3cc87 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/Constants.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/Constants.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.iec60870;
import org.apache.camel.spi.Metadata;
+@Deprecated(since = "4.21")
public interface Constants {
String SCHEME_SERVER = "iec60870-server";
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckChannelHandler.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckChannelHandler.java
index e3a0e45ca3fb..86d51dbfb384 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckChannelHandler.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckChannelHandler.java
@@ -27,6 +27,7 @@ import
org.eclipse.neoscada.protocol.iec60870.asdu.types.StandardCause;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated(since = "4.21")
public class DiscardAckChannelHandler extends ChannelInboundHandlerAdapter {
private static final Logger LOG =
LoggerFactory.getLogger(DiscardAckChannelHandler.class);
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckModule.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckModule.java
index 5265ac550b7d..1c661bee1f9c 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckModule.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/DiscardAckModule.java
@@ -24,6 +24,7 @@ import
org.eclipse.neoscada.protocol.iec60870.client.ClientModule;
import org.eclipse.neoscada.protocol.iec60870.server.Server;
import org.eclipse.neoscada.protocol.iec60870.server.ServerModule;
+@Deprecated(since = "4.21")
public class DiscardAckModule implements ClientModule, ServerModule {
@Override
public void initializeChannel(final SocketChannel channel, final
MessageChannel messageChannel) {
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ObjectAddress.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ObjectAddress.java
index fefcbe20a456..b4033b3d11e0 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ObjectAddress.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/ObjectAddress.java
@@ -22,6 +22,7 @@ import java.util.Objects;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.ASDUAddress;
import
org.eclipse.neoscada.protocol.iec60870.asdu.types.InformationObjectAddress;
+@Deprecated(since = "4.21")
public class ObjectAddress {
int[] address;
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java
index d6876af41640..728ee318971f 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.annotations.Component;
import org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions;
@Component("iec60870-client")
+@Deprecated(since = "4.21")
public class ClientComponent extends
AbstractIecComponent<ClientConnectionMultiplexor, ClientOptions> {
public ClientComponent(final CamelContext context) {
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
index 110f7278f306..3469365df672 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
@@ -50,6 +50,7 @@ import
org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated(since = "4.21")
public class ClientConnection {
private static final Logger LOG =
LoggerFactory.getLogger(ClientConnection.class);
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnectionMultiplexor.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnectionMultiplexor.java
index a91844c72983..3eea4f1db6ec 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnectionMultiplexor.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnectionMultiplexor.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.iec60870.client;
import org.apache.camel.component.iec60870.AbstractConnectionMultiplexor;
+@Deprecated(since = "4.21")
public class ClientConnectionMultiplexor extends AbstractConnectionMultiplexor
{
private final ClientConnection connection;
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java
index 46368e91f477..4a3d9e813d10 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java
@@ -25,6 +25,7 @@ import org.apache.camel.support.DefaultConsumer;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.QualityInformation;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value;
+@Deprecated(since = "4.21")
public class ClientConsumer extends DefaultConsumer {
private final ClientConnection connection;
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
index d4092a4a04c9..3c1722768a85 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
@@ -34,6 +34,7 @@ import static
org.apache.camel.component.iec60870.Constants.SCHEME_CLIENT;
*/
@UriEndpoint(firstVersion = "2.20.0", scheme = SCHEME_CLIENT, syntax =
"iec60870-client:uriPath",
title = "IEC 60870 Client", category = { Category.IOT },
headersClass = Constants.class)
+@Deprecated(since = "4.21")
public class ClientEndpoint extends
AbstractIecEndpoint<ClientConnectionMultiplexor> {
public ClientEndpoint(final String uri, final DefaultComponent component,
final ClientConnectionMultiplexor connection,
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientOptions.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientOptions.java
index 593a3b425696..a318d6dab178 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientOptions.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientOptions.java
@@ -25,6 +25,7 @@ import org.eclipse.neoscada.protocol.iec60870.ProtocolOptions;
import org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions;
@UriParams
+@Deprecated(since = "4.21")
public class ClientOptions extends BaseOptions<ClientOptions> {
/**
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientProducer.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientProducer.java
index d50fe79c3aae..ccc15e103424 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientProducer.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientProducer.java
@@ -30,6 +30,7 @@ import
org.eclipse.neoscada.protocol.iec60870.asdu.types.CauseOfTransmission;
import
org.eclipse.neoscada.protocol.iec60870.asdu.types.InformationObjectAddress;
import
org.eclipse.neoscada.protocol.iec60870.asdu.types.QualifierOfInterrogation;
+@Deprecated(since = "4.21")
public class ClientProducer extends DefaultProducer {
private final ClientConnection connection;
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java
index aa965ae6d936..83f938234f34 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.annotations.Component;
import org.eclipse.neoscada.protocol.iec60870.server.data.DataModuleOptions;
@Component("iec60870-server")
+@Deprecated(since = "4.21")
public class ServerComponent extends
AbstractIecComponent<ServerConnectionMultiplexor, ServerOptions> {
public ServerComponent(final CamelContext context) {
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConnectionMultiplexor.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConnectionMultiplexor.java
index 8c408008a5bb..e39928fb4123 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConnectionMultiplexor.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConnectionMultiplexor.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.iec60870.server;
import org.apache.camel.component.iec60870.AbstractConnectionMultiplexor;
+@Deprecated(since = "4.21")
public class ServerConnectionMultiplexor extends AbstractConnectionMultiplexor
{
private final ServerInstance server;
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java
index 78cbf2828c43..7c1cfbcfd5f6 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java
@@ -30,6 +30,7 @@ import
org.eclipse.neoscada.protocol.iec60870.server.data.model.WriteModel.Reque
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated(since = "4.21")
public class ServerConsumer extends DefaultConsumer {
private static final Logger LOG =
LoggerFactory.getLogger(ServerConsumer.class);
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java
index f453c874d496..d4becdf26453 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java
@@ -35,6 +35,7 @@ import static
org.apache.camel.component.iec60870.Constants.SCHEME_SERVER;
*/
@UriEndpoint(firstVersion = "2.20.0", scheme = SCHEME_SERVER, syntax =
"iec60870-server:uriPath",
title = "IEC 60870 Server", category = { Category.IOT },
headersClass = Constants.class)
+@Deprecated(since = "4.21")
public class ServerEndpoint extends
AbstractIecEndpoint<ServerConnectionMultiplexor> {
/**
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerInstance.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerInstance.java
index 92cf5f471c47..8b49518cc33f 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerInstance.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerInstance.java
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
import static java.util.Arrays.asList;
+@Deprecated(since = "4.21")
public class ServerInstance {
private static final Logger LOG =
LoggerFactory.getLogger(ServerInstance.class);
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerOptions.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerOptions.java
index c265537d4c7c..573f110c31a8 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerOptions.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerOptions.java
@@ -25,6 +25,7 @@ import org.eclipse.neoscada.protocol.iec60870.ProtocolOptions;
import org.eclipse.neoscada.protocol.iec60870.server.data.DataModuleOptions;
@UriParams
+@Deprecated(since = "4.21")
public class ServerOptions extends BaseOptions<ServerOptions> {
/**
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerProducer.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerProducer.java
index 6682d83e211a..727502baaaf4 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerProducer.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerProducer.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value;
+@Deprecated(since = "4.21")
public class ServerProducer extends DefaultProducer {
private final ServerEndpoint endpoint;
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
index e2e840641219..d1e3ccb2cc16 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
@@ -290,7 +290,7 @@ Two new endpoint options have been added to control the
pull fetch loop:
* `pullBatchSize` (default `10`) — maximum number of messages to fetch per
pull request.
* `pullFetchTimeout` (default `1000` ms) — maximum time to wait for a batch on
each fetch.
-=== Deprecation of camel-ironmq
+=== Deprecation of camel-ironmqThe library used had no stable release since
2007. There is no Java library very active for this protocol.
The component camel-ironmq is deprecated. The official library used has been
unmaintained since 2017
All the other client libraries (in other languages) are unmaintained since the
same amount of time.
@@ -303,3 +303,8 @@ The component camel-digitalocean is deprecated. The java
library used has been u
=== Deprecation of camel-irc
The component camel-irc is deprecated. The library used had no stable release
since 2007. There is no Java library very active for this protocol.
+
+=== Deprecation of camel-iec-60870
+
+The component camel-iec-60870 is deprecated. The library used to implement it
NeoScada is no more maintained since 2021. There are no alternatives in Java
with compatible license.
+
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index f67dee15c2fb..5dc5608e89dd 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -7881,6 +7881,7 @@ public class StaticEndpointBuilders {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
public static ClientEndpointBuilderFactory.ClientEndpointBuilder
iec60870Client(String path) {
return iec60870Client("iec60870-client", path);
}
@@ -7903,6 +7904,7 @@ public class StaticEndpointBuilders {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
public static ClientEndpointBuilderFactory.ClientEndpointBuilder
iec60870Client(String componentName, String path) {
return ClientEndpointBuilderFactory.endpointBuilder(componentName,
path);
}
@@ -7923,6 +7925,7 @@ public class StaticEndpointBuilders {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
public static ServerEndpointBuilderFactory.ServerEndpointBuilder
iec60870Server(String path) {
return iec60870Server("iec60870-server", path);
}
@@ -7945,6 +7948,7 @@ public class StaticEndpointBuilders {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
public static ServerEndpointBuilderFactory.ServerEndpointBuilder
iec60870Server(String componentName, String path) {
return ServerEndpointBuilderFactory.endpointBuilder(componentName,
path);
}
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
index 353a0970c8a2..fd932994c10b 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
@@ -1687,6 +1687,7 @@ public interface ClientEndpointBuilderFactory {
*
* @return the dsl builder for the headers' name.
*/
+ @Deprecated
default ClientHeaderNameBuilder iec60870Client() {
return ClientHeaderNameBuilder.INSTANCE;
}
@@ -1707,6 +1708,7 @@ public interface ClientEndpointBuilderFactory {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
default ClientEndpointBuilder iec60870Client(String path) {
return
ClientEndpointBuilderFactory.endpointBuilder("iec60870-client", path);
}
@@ -1729,6 +1731,7 @@ public interface ClientEndpointBuilderFactory {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
default ClientEndpointBuilder iec60870Client(String componentName,
String path) {
return ClientEndpointBuilderFactory.endpointBuilder(componentName,
path);
}
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
index 796b05f05443..2ea904f57200 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
@@ -1777,6 +1777,7 @@ public interface ServerEndpointBuilderFactory {
*
* @return the dsl builder for the headers' name.
*/
+ @Deprecated
default ServerHeaderNameBuilder iec60870Server() {
return ServerHeaderNameBuilder.INSTANCE;
}
@@ -1797,6 +1798,7 @@ public interface ServerEndpointBuilderFactory {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
default ServerEndpointBuilder iec60870Server(String path) {
return
ServerEndpointBuilderFactory.endpointBuilder("iec60870-server", path);
}
@@ -1819,6 +1821,7 @@ public interface ServerEndpointBuilderFactory {
* @param path uriPath
* @return the dsl builder
*/
+ @Deprecated
default ServerEndpointBuilder iec60870Server(String componentName,
String path) {
return ServerEndpointBuilderFactory.endpointBuilder(componentName,
path);
}
