diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index e69de29bb..e2d3c6c9b 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -0,0 +1,2 @@ +[cygnus-common] remove hive-exec dependency (unneeded) +[cygnus-ngsi] add jodd-core 3.6.8 dependency (previously included as transitive dependency of hive-exec in cygnus-common) diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 3decee4c6..22ab9764d 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -90,12 +90,6 @@ hadoop-core 1.2.1 - - - org.apache.hive - hive-exec - 2.3.4 - org.apache.hive hive-jdbc diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/utils/CommonUtils.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/utils/CommonUtils.java index 14c0ba09e..637a4ec06 100644 --- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/utils/CommonUtils.java +++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/utils/CommonUtils.java @@ -46,12 +46,10 @@ import org.I0Itec.zkclient.exception.ZkNoNodeException; import org.apache.flume.interceptor.RegexExtractorInterceptorMillisSerializer; import org.apache.hive.jdbc.HivePreparedStatement; -import org.apache.hadoop.hive.ql.exec.AbstractMapJoinOperator; import org.apache.hadoop.metrics.spi.AbstractMetricsContext; import org.apache.http.impl.DefaultBHttpServerConnection; import org.apache.http.impl.conn.PoolingClientConnectionManager; import org.apache.log4j.pattern.SequenceNumberPatternConverter; -import org.codehaus.groovy.control.ErrorCollector; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; @@ -423,11 +421,7 @@ public static void printLoadedJars() { // trace the file containing the httpcore library myClassURL = DefaultBHttpServerConnection.class.getProtectionDomain().getCodeSource().getLocation(); LOGGER.debug("Loading httpcore from " + myClassURL.toExternalForm()); - - // trace the file containing the junit library - myClassURL = ErrorCollector.class.getProtectionDomain().getCodeSource().getLocation(); - LOGGER.debug("Loading junit from " + myClassURL.toExternalForm()); - + // trace the file containing the flume-ng-node library myClassURL = RegexExtractorInterceptorMillisSerializer.class.getProtectionDomain().getCodeSource().getLocation(); @@ -460,11 +454,7 @@ public static void printLoadedJars() { // trace the file containing the hadoop-core library myClassURL = AbstractMetricsContext.class.getProtectionDomain().getCodeSource().getLocation(); LOGGER.debug("Loading hadoop-core from " + myClassURL.toExternalForm()); - - // trace the file containing the hive-exec library - myClassURL = AbstractMapJoinOperator.class.getProtectionDomain().getCodeSource().getLocation(); - LOGGER.debug("Loading hive-exec from " + myClassURL.toExternalForm()); - + // trace the file containing the hive-jdbc library myClassURL = HivePreparedStatement.class.getProtectionDomain().getCodeSource().getLocation(); LOGGER.debug("Loading hive-jdbc from " + myClassURL.toExternalForm()); diff --git a/cygnus-ngsi-ld/src/main/java/com/telefonica/iot/cygnus/utils/NGSIUtils.java b/cygnus-ngsi-ld/src/main/java/com/telefonica/iot/cygnus/utils/NGSIUtils.java index 02fff9156..24ba00ff0 100644 --- a/cygnus-ngsi-ld/src/main/java/com/telefonica/iot/cygnus/utils/NGSIUtils.java +++ b/cygnus-ngsi-ld/src/main/java/com/telefonica/iot/cygnus/utils/NGSIUtils.java @@ -21,7 +21,6 @@ import com.telefonica.iot.cygnus.log.CygnusLogger; import java.util.regex.Pattern; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.ivy.osgi.p2.P2Artifact; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 42bbad5e6..81ae8ad12 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -58,7 +58,14 @@ cygnus-common 2.9.1 - + + + org.jodd + jodd-core + 3.6.8 + + +