From 901d2b575f3e6fbaf1e954e6b50397190fe92e01 Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Thu, 27 Jul 2017 13:32:36 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@151381 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 12 +++++++++++- .../dataminer/poolmanager/rest/RestPoolManager.java | 1 + .../poolmanager/util/NotificationHelper.java | 2 +- .../dataminer/poolmanager/util/SVNUpdater.java | 2 -- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3ec737f..82c0358 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,20 @@ org.gcube.dataanalysis ecological-engine-smart-executor - [1.4.0-SNAPSHOT, 1.5.0-SNAPSHOT) + [1.4.0-SNAPSHOT, 1.6.0-SNAPSHOT] + + javax.servlet + servlet-api + 2.5 + provided + + + + + org.json json diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java index 7335031..4d70ff4 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java @@ -1,5 +1,6 @@ package org.gcube.dataanalysis.dataminer.poolmanager.rest; + import static org.gcube.common.authorization.client.Constants.authorizationService; ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/NotificationHelper.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/NotificationHelper.java index ed96c5f..0f02bed 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/NotificationHelper.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/NotificationHelper.java @@ -5,7 +5,7 @@ import java.util.Calendar; import org.apache.commons.lang.StringUtils; -import scala.actors.threadpool.Arrays; +***REMOVED***import scala.actors.threadpool.Arrays; public class NotificationHelper { diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java index 2fe322d..a33bbd4 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java @@ -1,10 +1,8 @@ package org.gcube.dataanalysis.dataminer.poolmanager.util; import org.apache.commons.io.FileUtils; -import org.apache.tools.ant.FileScanner; import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.Algorithm; import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.Dependency; -import org.tmatesoft.sqljet.core.internal.lang.SqlParser.column_constraint_check_return; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNNodeKind; import org.tmatesoft.svn.core.SVNURL;