summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-05-25 17:23:51 +0000
committerOlivier Lamy <olamy@apache.org>2011-05-25 17:23:51 +0000
commit4f0e6573614ff579bfcf684c302d669b706c836e (patch)
tree32ee1e2dd3a0b900514053c73a87f9a8810bd0e5 /archiva-modules
parenta3c891b60dc7b030c94d97075d92faeb9702f169 (diff)
downloadarchiva-4f0e6573614ff579bfcf684c302d669b706c836e.tar.gz
archiva-4f0e6573614ff579bfcf684c302d669b706c836e.zip
fix compilation failure now we use standard java.util.concurrent.*
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1127588 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
index 6c57143f7..067e7ef48 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
@@ -19,7 +19,6 @@ package org.apache.maven.archiva.web.startup;
* under the License.
*/
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
import org.apache.maven.archiva.common.ArchivaException;
@@ -34,9 +33,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import java.lang.reflect.Field;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+import java.lang.reflect.Field;
+import java.util.concurrent.ExecutorService;
/**
* ArchivaStartup - the startup of all archiva features in a deterministic order.