Merge pull request apache#6067 from aaltay/removeprops

[BEAM-5024] Remove reference to dataflow-distribution.properties

Author: aaltay

runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunnerInfo.java

@@ -34,8 +34,6 @@ public final class DataflowRunnerInfo extends ReleaseInfo {
 
   private static final String APACHE_BEAM_DISTRIBUTION_PROPERTIES_PATH =
       "/org/apache/beam/runners/dataflow/dataflow.properties";
-  private static final String DATAFLOW_DISTRIBUTION_PROPERTIES_PATH =
-      "/org/apache/beam/runners/dataflow/dataflow-distribution.properties";
   private static final String FNAPI_ENVIRONMENT_MAJOR_VERSION_KEY =
       "fnapi.environment.major.version";
   private static final String LEGACY_ENVIRONMENT_MAJOR_VERSION_KEY =
@@ -48,10 +46,7 @@ private static class LazyInit {
     static {
       Properties properties;
       try {
-        properties = load(DATAFLOW_DISTRIBUTION_PROPERTIES_PATH);
-        if (properties == null) {
-          properties = load(APACHE_BEAM_DISTRIBUTION_PROPERTIES_PATH);
-        }
+        properties = load(APACHE_BEAM_DISTRIBUTION_PROPERTIES_PATH);
         if (properties == null) {
           // Print a warning if we can not load either the Dataflow distribution properties
           // or the