Revert "some stuff"

This reverts commit 52598d3bca.

extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java

@@ -24,7 +24,6 @@ import com.amazonaws.ClientConfigurationFactory;
 import com.amazonaws.Protocol;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
-import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.fasterxml.jackson.core.Version;
@@ -142,10 +141,8 @@ public class S3StorageDruidModule implements DruidModule
         .withClientConfiguration(S3Utils.setProxyConfig(configuration, proxyConfig).withProtocol(protocol))
         .withChunkedEncodingDisabled(clientConfig.isDisableChunkedEncoding())
         .withPathStyleAccessEnabled(clientConfig.isEnablePathStyleAccess())
-        .withRegion(Regions.US_WEST_2)
         .withForceGlobalBucketAccessEnabled(clientConfig.isForceGlobalBucketAccessEnabled());
 
-
     if (StringUtils.isNotEmpty(endpointConfig.getUrl())) {
       amazonS3ClientBuilder.setEndpointConfiguration(
           new EndpointConfiguration(endpointConfig.getUrl(), endpointConfig.getSigningRegion())

integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java

@@ -51,7 +51,6 @@ public class DiscovertModule extends AbstractModule {
       return null;
     }
 
-
     @Provides
     @LazySingleton
     public Properties getProps() {

integration-tests/src/main/java/org/apache/druid/quidem/Launcher.java

@@ -99,8 +99,7 @@ public class Launcher
       chk1();
       chkStatus();
 
-      lifecycle.join();
-//      lifecycle.stop();
+      lifecycle.stop();
     } else {
 
     }

integration-tests/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java

@@ -30,6 +30,5 @@ public class QuidemCaptureModule implements Module
   public void configure(Binder binder)
   {
     Jerseys.addResource(binder, QuidemCapture.class);
-//    Hook.CONVERTED.add(null)
   }
 }

sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java

@@ -112,7 +112,7 @@ public class PlannerFactory extends PlannerToolbox
         queryContext,
         hook
     );
-    
+
     return new DruidPlanner(buildFrameworkConfig(context), context, engine, hook);
   }