Skip to content

Commit

Permalink
Remove Deprecated Shutdown strategy classes
Browse files Browse the repository at this point in the history
Signed-off-by: Glenn Renfro <grenfro@vmware.com>
  • Loading branch information
cppwfs committed Nov 7, 2024
1 parent 4868bbb commit 59b5ba3
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 280 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

import java.io.IOException;

import org.springframework.cloud.dataflow.common.test.docker.compose.execution.AggressiveShutdownStrategy;
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.AggressiveShutdownWithNetworkCleanupStrategy;
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.Docker;
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerCompose;
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.GracefulShutdownStrategy;
Expand All @@ -31,20 +29,6 @@
*/
public interface ShutdownStrategy {

/**
* Call rm on all containers, working around btrfs bug on CircleCI.
*
* @deprecated Use {@link #KILL_DOWN} (the default strategy)
*/
@Deprecated
ShutdownStrategy AGGRESSIVE = new AggressiveShutdownStrategy();
/**
* Call rm on all containers, then call docker-compose down.
*
* @deprecated Use {@link #KILL_DOWN} (the default strategy)
*/
@Deprecated
ShutdownStrategy AGGRESSIVE_WITH_NETWORK_CLEANUP = new AggressiveShutdownWithNetworkCleanupStrategy();
/**
* Call docker-compose down, kill, then rm. Allows containers up to 10 seconds to shut down
* gracefully.
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 2 additions & 1 deletion whats-new.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ VersionInfoProperties versionInfoProperties, SecurityStateBean securityStateBean
* The deprecated `rollback(String releaseName, int releaseVersion)` method in SkipperClient has been removed. Use `rollback(RollbackRequest rollbackRequest).
* Removed the `DefaultTaskExecutionService` constructor that does not take the `composedTaskRunnerConfigurationProperties` parameter. Use the constructor that offers the `composedTaskRunnerConfigurationProperties` parameter.
* * Removed the `DefaultTaskExecutionInfoService` constructor that does not take the `composedTaskRunnerConfigurationProperties` parameter. Use the constructor that offers the `composedTaskRunnerConfigurationProperties` parameter.
=== Breaking Changes
* AggressiveShutdownStrategy & AggressiveShutdownWithNetworkCleanupStrategy deprecated classes have been removed. Use the KillDownShutdownStrategy class.
== Breaking Changes
Announce deprecated changes here

0 comments on commit 59b5ba3

Please sign in to comment.