Merge branch 'master' into uplift-zeromq

Author: Emil-Gustafsson

.gitignore

@@ -2,3 +2,8 @@
 build/
 *.iml
 .gradle
+.classpath
+.project
+.settings/
+/bin/
+target/

.travis.yml

@@ -1,3 +1,22 @@
 language: java
 dist: trusty
 jdk: oraclejdk8
+
+notifications:
+    webhooks: https://www.travisbuddy.com/
+    on_success: never
+
+before_deploy:
+  - ./gradlew clean
+  - ./gradlew -Pversion=${TRAVIS_TAG:1} assemble
+  - cp pom.xml build/libs/trex-java-sdk-${TRAVIS_TAG:1}.pom
+  
+deploy:
+  - provider: releases
+    api_key: "$GITHUB_TOKEN"
+    file_glob: true
+    file: "build/libs/*"
+    skip_cleanup: true
+    on:
+        branch: master
+        tags: true #Deploying only on tagged builds

build.gradle

@@ -1,26 +1,38 @@
 group 'com.cisco.trex'
-version '1.0-SNAPSHOT'
 
 apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'com.github.sherter.google-java-format'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+buildscript {
+  repositories {
+    maven {
+      url "https://plugins.gradle.org/m2/"
+    }
+  }
+  dependencies {
+    classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8"
+  }
+}
+
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compile group: 'org.pcap4j', name: 'pcap4j-core', version:'1.7.1'
-    compile group: 'org.pcap4j', name: 'pcap4j-packetfactory-static', version:'1.7.1'
-    compile group: 'commons-lang', name: 'commons-lang', version:'2.4'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
+    compile group: 'org.pcap4j', name: 'pcap4j-packetfactory-static', version:'1.7.7' //1.8.0+ requires java 9
+    compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.9'
+    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
     compile group: 'org.zeromq', name: 'jeromq', version:'0.5.1'
-    compile group: 'com.google.code.gson', name: 'gson', version:'2.7'
+    compile group: 'com.google.code.gson', name: 'gson', version:'2.8.5'
     compile group: 'com.google.guava', name: 'guava', version: '24.0-jre'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:'2.6.0'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.6.0'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.9.8'
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.28.2'
 
     sourceSets {
         e2eTest {
@@ -33,6 +45,51 @@ dependencies {
     }
 }
 
+task writePom {
+    doLast {
+        pom {
+            project {
+            	artifactId 'trex-java-sdk'
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+            }
+        }.writeTo("pom.xml")
+    }
+}
+
+jar {
+    dependsOn writePom
+    into("META-INF/maven/$project.group/$project.name") {
+	from("pom.xml")
+    }
+}
+
+task javadocJar(type: Jar) {
+	classifier = 'javadoc'
+	javadoc.options.addStringOption('Xdoclint:none', '-quiet')
+	from javadoc
+}
+
+task sourcesJar(type: Jar) {
+  classifier = 'sources'
+  from sourceSets.main.allSource
+}
+
+task jarWithDependencies(type: Jar) {
+    dependsOn writePom
+    baseName = project.name + '-with-dependencies'
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
+}
+
+artifacts {
+  archives javadocJar, sourcesJar, jarWithDependencies
+}
+
 test {
     testLogging {
         events "passed", "skipped" , "failed"

examples/bootstrap/src/main/java/com/cisco/trex/stateless/TRexClientApp.java

@@ -1,42 +1,36 @@
 package com.cisco.trex.stateless;
 
 import com.cisco.trex.stateless.exception.TRexConnectionException;
-import com.cisco.trex.stateless.exception.TRexTimeoutException;
 import com.cisco.trex.stateless.model.*;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class TRexClientApp {
-    public static TRexClient client = null;
-    public static final String client_name = "trex-test-user";
-    public static final String trex_host = "trex.mycompany.com";
-    public static final String trex_port = "4501";
-    private static Logger logger = LoggerFactory.getLogger(TRexClientApp.class);
-    
-    // API usage example. see also:
-    // https://github.com/cisco-system-traffic-generator/trex-java-sdk/blob/master/src/test/java/com/cisco/trex/stateless/TRexClientTest.java
+  public static TRexClient client = null;
+  public static final String client_name = "trex-test-user";
+  public static final String trex_host = "trex.mycompany.com";
+  public static final String trex_port = "4501";
+  private static Logger logger = LoggerFactory.getLogger(TRexClientApp.class);
 
-    public static void main(String[] args) {
-        client = new TRexClient(trex_host, trex_port, client_name);
-        try {
-            client.connect();
-            List<Port> ports = client.getPorts();
-            System.out.println("Found " + ports.size() + " ports");
-            List<String> cmds = client.getSupportedCommands();
-            logger.info("List of available commands:");
-            for (String cmd : cmds) {
-                logger.info(" - " + cmd);
-            }
-        } catch (TRexConnectionException e) {
-            e.printStackTrace();
-        } finally {
-            client.disconnect();
-        }
+  // API usage example. see also:
+  // https://github.com/cisco-system-traffic-generator/trex-java-sdk/blob/master/src/test/java/com/cisco/trex/stateless/TRexClientTest.java
+
+  public static void main(String[] args) {
+    client = new TRexClient(trex_host, trex_port, client_name);
+    try {
+      client.connect();
+      List<Port> ports = client.getPorts();
+      System.out.println("Found " + ports.size() + " ports");
+      List<String> cmds = client.getSupportedCommands();
+      logger.info("List of available commands:");
+      for (String cmd : cmds) {
+        logger.info(" - " + cmd);
+      }
+    } catch (TRexConnectionException e) {
+      e.printStackTrace();
+    } finally {
+      client.disconnect();
     }
+  }
 }
-

gradle.properties

@@ -0,0 +1,3 @@
+group=com.cisco.trex
+archivesBaseName=trex-java-sdk
+version=1.0-SNAPSHOT