Merge pull request #2041 from telefonicaid/AlvaroVega-patch-2

backport for 2.9.1 (missed dep)

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)

cygnus-common/pom.xml

@@ -90,12 +90,6 @@
             <artifactId>hadoop-core</artifactId>
             <version>1.2.1</version>
         </dependency>
-        <!-- Required by HiveBackendImpl at runtime -->
-        <dependency>
-            <groupId>org.apache.hive</groupId>
-            <artifactId>hive-exec</artifactId>
-            <version>2.3.4</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-jdbc</artifactId>

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());

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;

cygnus-ngsi/pom.xml

@@ -58,7 +58,14 @@
             <artifactId>cygnus-common</artifactId>
             <version>2.9.1</version>
         </dependency>
-
+        <!-- https://mvnrepository.com/artifact/org.jodd/jodd-util -->
+        <dependency>
+            <groupId>org.jodd</groupId>
+            <artifactId>jodd-core</artifactId>
+            <version>3.6.8</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>