Fix the since value of the Pacemaker deprecations: 3.2.0, not 3.1.0

storm-client/src/jvm/org/apache/storm/Config.java

@@ -1420,7 +1420,7 @@ public class Config extends HashMap<String, Object> {
      *     to Nimbus) instead.
      */
     @IsStringList
-    @Deprecated(since = "3.1.0", forRemoval = true)
+    @Deprecated(since = "3.2.0", forRemoval = true)
     public static final String PACEMAKER_SERVERS = "pacemaker.servers";
     /**
      * The port Pacemaker should run on. Clients should connect to this port to submit or read
@@ -1433,7 +1433,7 @@ public class Config extends HashMap<String, Object> {
      */
     @IsNumber
     @IsPositiveNumber
-    @Deprecated(since = "3.1.0", forRemoval = true)
+    @Deprecated(since = "3.2.0", forRemoval = true)
     public static final String PACEMAKER_PORT = "pacemaker.port";
     /**
      * The maximum number of threads that should be used by the Pacemaker client.
@@ -1447,7 +1447,7 @@ public class Config extends HashMap<String, Object> {
      */
     @IsNumber
     @IsPositiveNumber
-    @Deprecated(since = "3.1.0", forRemoval = true)
+    @Deprecated(since = "3.2.0", forRemoval = true)
     public static final String PACEMAKER_CLIENT_MAX_THREADS = "pacemaker.client.max.threads";
     /**
      * This should be one of "DIGEST", "KERBEROS", or "NONE" Determines the mode of authentication
@@ -1464,7 +1464,7 @@ public class Config extends HashMap<String, Object> {
      *     to Nimbus) instead.
      */
     @CustomValidator(validatorClass = ConfigValidation.PacemakerAuthTypeValidator.class)
-    @Deprecated(since = "3.1.0", forRemoval = true)
+    @Deprecated(since = "3.2.0", forRemoval = true)
     public static final String PACEMAKER_AUTH_METHOD = "pacemaker.auth.method";
     /**
      * Pacemaker Thrift Max Message Size (bytes).
@@ -1476,7 +1476,7 @@ public class Config extends HashMap<String, Object> {
      */
     @IsInteger
     @IsPositiveNumber
-    @Deprecated(since = "3.1.0", forRemoval = true)
+    @Deprecated(since = "3.2.0", forRemoval = true)
     public static final String PACEMAKER_THRIFT_MESSAGE_SIZE_MAX =
         "pacemaker.thrift.message.size.max";
     /**

storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java

@@ -46,15 +46,15 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class PaceMakerStateStorage implements IStateStorage {
 
     private static final int maxRetries = 10;
     private static Logger LOG = LoggerFactory.getLogger(PaceMakerStateStorage.class);
     private PacemakerClientPool pacemakerClientPool;
     private IStateStorage stateStorage;
 
     public PaceMakerStateStorage(PacemakerClientPool pacemakerClientPool,
             IStateStorage stateStorage) throws Exception {
         this.pacemakerClientPool = pacemakerClientPool;
         this.stateStorage = stateStorage;
@@ -142,7 +142,7 @@
                 }
                 LOG.debug("Successful set_worker_hb");
                 break;
             } catch (HBExecutionException | PacemakerConnectionException e) {
                 if (retry <= 0) {
                     throw new RuntimeException(e);
                 }
@@ -190,7 +190,7 @@
                     throw new WrappedHBExecutionException("Failed to get a response.");
                 }
                 return ret;
             } catch (HBExecutionException | PacemakerConnectionException e) {
                 if (retry <= 0) {
                     throw new RuntimeException(e);
                 }
@@ -227,7 +227,7 @@
 
                 LOG.debug("Successful get_worker_hb_children");
                 return new ArrayList<>(retSet);
             } catch (PacemakerConnectionException e) {
                 if (retry <= 0) {
                     throw new RuntimeException(e);
                 }
@@ -265,7 +265,7 @@
                 } else {
                     throw new WrappedHBExecutionException("Failed to delete from all pacemakers.");
                 }
             } catch (HBExecutionException | PacemakerConnectionException e) {
                 if (retry <= 0) {
                     if (someSucceeded) {
                         LOG.warn("Unable to delete_worker_hb from every pacemaker.");

storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java

@@ -31,7 +31,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class PaceMakerStateStorageFactory implements StateStorageFactory {
     @Override
     public IStateStorage mkStore(Map<String, Object> config, Map<String, Object> authConf,

storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java

@@ -47,7 +47,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class PacemakerClient implements ISaslClient {
 
     private static final Logger LOG = LoggerFactory.getLogger(PacemakerClient.class);

storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java

@@ -30,7 +30,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class PacemakerClientHandler extends ChannelInboundHandlerAdapter {
     private static final Logger LOG = LoggerFactory.getLogger(PacemakerClientHandler.class);
 

storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java

@@ -32,7 +32,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class PacemakerClientPool {
 
     private static final Logger LOG = LoggerFactory.getLogger(PacemakerClientPool.class);

storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerConnectionException.java

@@ -21,7 +21,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class PacemakerConnectionException extends Exception {
     public PacemakerConnectionException(String err) {
         super(err);

storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java

@@ -34,7 +34,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class ThriftDecoder extends ByteToMessageDecoder {
 
     private static final Logger LOG = LoggerFactory.getLogger(ThriftDecoder.class);

storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java

@@ -37,7 +37,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class ThriftEncoder extends MessageToMessageEncoder<Object> {
 
     private static final Logger LOG = LoggerFactory

storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java

@@ -34,7 +34,7 @@
  *     them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class ThriftNettyClientCodec extends ChannelInitializer<Channel> {
 
     public static final String SASL_HANDLER = "sasl-handler";

storm-server/src/main/java/org/apache/storm/DaemonConfig.java

@@ -676,7 +676,7 @@ public class DaemonConfig implements Validated {
      */
     @IsNumber
     @IsPositiveNumber
-    @Deprecated(since = "3.1.0", forRemoval = true)
+    @Deprecated(since = "3.2.0", forRemoval = true)
     public static final String PACEMAKER_MAX_THREADS = "pacemaker.max.threads";
 
     /**
@@ -686,7 +686,7 @@ public class DaemonConfig implements Validated {
      *     Use the default heartbeat path (workers heartbeat to their supervisor, which reports them to Nimbus) instead.
      */
     @IsStringOrStringList
-    @Deprecated(since = "3.1.0", forRemoval = true)
+    @Deprecated(since = "3.2.0", forRemoval = true)
     public static final String PACEMAKER_CHILDOPTS = "pacemaker.childopts";
 
 

storm-server/src/main/java/org/apache/storm/pacemaker/IServerMessageHandler.java

@@ -21,7 +21,7 @@
  *     Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public interface IServerMessageHandler {
 
     HBMessage handleMessage(HBMessage m, boolean authenticated);

storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java

@@ -40,8 +40,8 @@
  *     Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class Pacemaker implements IServerMessageHandler {
 
     private static final Logger LOG = LoggerFactory.getLogger(Pacemaker.class);
     private final Meter meterSendPulseCount;
@@ -209,9 +209,9 @@
         return new HBMessage(HBServerMessageType.DELETE_PULSE_ID_RESPONSE, null);
     }
 
     private PacemakerServer launchServer() {
         LOG.info("Starting pacemaker server for storm version '{}", VersionInfo.getVersion());
         return new PacemakerServer(this, conf);
     }
 
 }

storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java

@@ -45,24 +45,24 @@
  *     Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 class PacemakerServer implements ISaslServer {
 
     private static final int FIVE_MB_IN_BYTES = 5 * 1024 * 1024;
 
     private static final Logger LOG = LoggerFactory.getLogger(PacemakerServer.class);
 
     private final IServerMessageHandler handler;
     private String secret;
     private final String topologyName;
     private volatile ChannelGroup allChannels = new DefaultChannelGroup("storm-server", GlobalEventExecutor.INSTANCE);
     private final ChannelGroup authenticatedChannels = new DefaultChannelGroup("authenticated-pacemaker-channels",
             GlobalEventExecutor.INSTANCE);
     private final ThriftNettyServerCodec.AuthMethod authMethod;
     private final EventLoopGroup bossEventLoopGroup;
     private final EventLoopGroup workerEventLoopGroup;
 
     PacemakerServer(IServerMessageHandler handler, Map<String, Object> config) {
         int port = (int) config.get(Config.PACEMAKER_PORT);
         this.handler = handler;
         this.topologyName = "pacemaker_server";

storm-server/src/main/java/org/apache/storm/pacemaker/codec/PacemakerServerHandler.java

@@ -27,7 +27,7 @@
  *     Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class PacemakerServerHandler extends StormServerHandler {
     private static final Logger LOG = LoggerFactory.getLogger(PacemakerServerHandler.class);
 

storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java

@@ -35,7 +35,7 @@
  *     Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over
  *     Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}).
  */
-@Deprecated(since = "3.1.0", forRemoval = true)
+@Deprecated(since = "3.2.0", forRemoval = true)
 public class ThriftNettyServerCodec extends ChannelInitializer<Channel> {
 
     public static final String SASL_HANDLER = "sasl-handler";