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 90893dd72bed6..f8cf248bc8850 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 7b6cade8f9a07..ad0835cc29a1a 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 9af4e1d63d391..1c94236997aba 100644 --- a/components/camel-iec60870/pom.xml +++ b/components/camel-iec60870/pom.xml @@ -28,7 +28,7 @@ camel-iec60870 jar - Camel :: IEC 60870 + Camel :: IEC 60870 (deprecated) Camel IEC 60870-5-104 support 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 90893dd72bed6..f8cf248bc8850 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 7b6cade8f9a07..ad0835cc29a1a 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 c2ab241df29b2..1ceeea795fbd0 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 994784749c8c2..33907d92a1a98 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 f2d4561f5b9a1..3e80871642d4b 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 5025f11518eda..ec13db8669f42 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.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 b78e1c320768b..9fee4edaabd31 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 static java.util.Objects.requireNonNull; +@Deprecated(since = "4.21") public abstract class AbstractIecComponent> 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 c1b59f27cdbd2..52130372bb958 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 static java.util.Objects.requireNonNull; +@Deprecated(since = "4.21") public abstract class AbstractIecEndpoint 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 9c30d4a2fe15f..f6350943387c0 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.ProtocolOptions; @UriParams +@Deprecated(since = "4.21") public abstract class BaseOptions> { /** 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 595dfda3ebac3..09b17312ccb8b 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 @@ 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 307f4ca20ce0c..23b5a3b3cc87d 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 @@ 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 e3a0e45ca3fb9..86d51dbfb3841 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.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 5265ac550b7d2..1c661bee1f9c9 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.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 fefcbe20a456e..b4033b3d11e01 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 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 d6876af416400..728ee318971ff 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.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions; @Component("iec60870-client") +@Deprecated(since = "4.21") public class ClientComponent extends AbstractIecComponent { 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 110f7278f3060..3469365df672b 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.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 a91844c729832..3eea4f1db6ec2 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 @@ 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 46368e91f4777..4a3d9e813d109 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.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 d4092a4a04c96..3c1722768a859 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 @@ */ @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 { 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 593a3b425696b..a318d6dab178a 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.client.data.DataModuleOptions; @UriParams +@Deprecated(since = "4.21") public class ClientOptions extends BaseOptions { /** 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 d50fe79c3aae4..ccc15e1034242 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.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 aa965ae6d936c..83f938234f34d 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.eclipse.neoscada.protocol.iec60870.server.data.DataModuleOptions; @Component("iec60870-server") +@Deprecated(since = "4.21") public class ServerComponent extends AbstractIecComponent { 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 8c408008a5bb0..e39928fb41234 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 @@ 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 78cbf2828c431..7c1cfbcfd5f63 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.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 f453c874d4966..d4becdf264538 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 @@ */ @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 { /** 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 92cf5f471c477..8b49518cc33fd 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 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 c265537d4c7c5..573f110c31a88 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.server.data.DataModuleOptions; @UriParams +@Deprecated(since = "4.21") public class ServerOptions extends BaseOptions { /** 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 6682d83e211a3..727502baaaf4f 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.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 e2e840641219e..d1e3ccb2cc161 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 f67dee15c2fb9..5dc5608e89dd5 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 static WatsonxDataEndpointBuilderFactory.WatsonxDataEndpointBuilder ibmWa * @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 static ClientEndpointBuilderFactory.ClientEndpointBuilder iec60870Client( * @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 static ClientEndpointBuilderFactory.ClientEndpointBuilder iec60870Client( * @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 static ServerEndpointBuilderFactory.ServerEndpointBuilder iec60870Server( * @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 353a0970c8a25..fd932994c10b4 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 ClientBuilders { * * @return the dsl builder for the headers' name. */ + @Deprecated default ClientHeaderNameBuilder iec60870Client() { return ClientHeaderNameBuilder.INSTANCE; } @@ -1707,6 +1708,7 @@ default ClientHeaderNameBuilder iec60870Client() { * @param path uriPath * @return the dsl builder */ + @Deprecated default ClientEndpointBuilder iec60870Client(String path) { return ClientEndpointBuilderFactory.endpointBuilder("iec60870-client", path); } @@ -1729,6 +1731,7 @@ default ClientEndpointBuilder iec60870Client(String path) { * @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 796b05f054432..2ea904f572005 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 ServerBuilders { * * @return the dsl builder for the headers' name. */ + @Deprecated default ServerHeaderNameBuilder iec60870Server() { return ServerHeaderNameBuilder.INSTANCE; } @@ -1797,6 +1798,7 @@ default ServerHeaderNameBuilder iec60870Server() { * @param path uriPath * @return the dsl builder */ + @Deprecated default ServerEndpointBuilder iec60870Server(String path) { return ServerEndpointBuilderFactory.endpointBuilder("iec60870-server", path); } @@ -1819,6 +1821,7 @@ default ServerEndpointBuilder iec60870Server(String path) { * @param path uriPath * @return the dsl builder */ + @Deprecated default ServerEndpointBuilder iec60870Server(String componentName, String path) { return ServerEndpointBuilderFactory.endpointBuilder(componentName, path); }