Revert move of Period component since it is used by devcockpit

4 files changed, 7 insertions, 4 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/components/Period.java b/sonar-batch/src/main/java/org/sonar/batch/components/Period.java
index 45ca282dd42..1b40539d4f5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/components/Period.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/components/Period.java
@@ -18,13 +18,16 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.batch.deprecated.components;
+package org.sonar.batch.components;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import java.util.Date;
 
+/**
+ * Used by devcockpit
+ */
 public class Period {
 
   private int index;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java b/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java
index ec346aa4dcc..36bec004e4a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/components/TimeMachineConfiguration.java
@@ -27,7 +27,6 @@ import org.sonar.api.batch.RequiresDB;
 import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.database.model.Snapshot;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.batch.deprecated.components.Period;
 import org.sonar.batch.deprecated.components.PeriodsDefinition;
 
 import javax.annotation.CheckForNull;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java
index 452fe02551c..f437ffa3744 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java
@@ -20,9 +20,9 @@
 
 package org.sonar.batch.debt;
 
-import org.sonar.batch.components.TimeMachineConfiguration;
+import org.sonar.batch.components.Period;
 
-import org.sonar.batch.deprecated.components.Period;
+import org.sonar.batch.components.TimeMachineConfiguration;
 import com.google.common.collect.ImmutableList;
 import org.sonar.api.batch.Decorator;
 import org.sonar.api.batch.DecoratorBarriers;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
index f2afec0566a..4217c08bc4f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
@@ -97,6 +97,7 @@ public class FileIndexer implements BatchComponent {
   }
 
   private void waitForTasksToComplete() {
+    executorService.shutdown();
     for (Future<Void> task : tasks) {
       try {
         task.get();