From 5ac58e3fa7aeda9e6455d145119227aecf58ed88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Reyes?= <areyes@continuumsecurity.net>
Date: Wed, 15 Apr 2020 14:28:07 +0200
Subject: [PATCH 1/2] [CON-462] Added plugin to export jar with dependencies

---
 README.md |  10 ++
 pom.xml   | 283 +++++++++++++++++++++++++++---------------------------
 2 files changed, 154 insertions(+), 139 deletions(-)

diff --git a/README.md b/README.md
index 132a87b..18a33b3 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,13 @@ IriusRisk client Java library
 To generate a jar file:
 
 	mvn package
+
+A library called iriusrisk-client-lib-0.1-SNAPSHOT-jar-with-dependencies.jar will be ready to be used. 
+
+To use the library in a Maven project add the following dependency after execute "mvn install" instead of "mvn package":
+
+        <dependency>
+            <groupId>com.iriusrisk</groupId>
+            <artifactId>iriusrisk-client-lib</artifactId>
+            <version>0.1-SNAPSHOT</version>
+        </dependency>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7617c6a..ee5182f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,140 +1,145 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.iriusrisk</groupId>
-    <artifactId>iriusrisk-client-lib</artifactId>
-    <packaging>jar</packaging>
-    <version>0.1-SNAPSHOT</version>
-    <name>iriusrisk-client-lib</name>
-    <url>http://maven.apache.org</url>
-    <build>
-        <defaultGoal>package</defaultGoal>
-        <plugins>
-
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <!-- activate the plugin -->
-            <plugin>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>2.4.13</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <!-- specify the swagger yaml -->
-                            <inputSpec>swagger.yaml</inputSpec>
-
-                            <!-- target to generate java client code -->
-                            <language>java</language>
-
-                            <!-- hint: if you want to generate java server code, e.g. based on Spring Boot,
-                                 you can use the following target: <language>spring</language> -->
-
-                            <!-- pass any necessary config options -->
-                            <configOptions>
-                                <dateLibrary>joda</dateLibrary>
-                                <apiPackage>com.iriusrisk.api</apiPackage>
-                                <modelPackage>com.iriusrisk.model</modelPackage>
-                                <artifactVersion>1</artifactVersion>
-                                <groupId>com.iriusrisk</groupId>
-                                <artifactId>iriusrisk-client-lib</artifactId>
-                            </configOptions>
-
-                            <!-- override the default library to jersey2 -->
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <!-- dependencies are needed for the client being generated -->
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-
-        <!-- You can find the dependencies for the library configuation you chose by looking in JavaClientCodegen.
-             Then find the corresponding dependency on Maven Central, and set the versions in the property section below -->
-
-        <!--
-        Swagger Codegen supports the following Client implementations:
-
-        jersey1 + Jackson
-        Jersey2 + Jackson
-        Feign + Jackson
-        *** OkHttp + Gson ***
-        Retrofit2/OkHttp + Gson
-        Spring RestTemplate + Jackson
-        Resteasy + Jackson
-
-        Ref: https://stackoverflow.com/questions/57545884/how-to-develop-a-simple-rest-client-using-swagger-codegen
-        -->
-
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${okhttp-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>logging-interceptor</artifactId>
-            <version>${okhttp-logging-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.gsonfire</groupId>
-            <artifactId>gson-fire</artifactId>
-            <version>${gson-fire-version}</version>
-        </dependency>
-
-        <!-- Base64 encoding that works in both JVM and Android -->
-        <dependency>
-            <groupId>com.brsanthu</groupId>
-            <artifactId>migbase64</artifactId>
-            <version>${migbase64-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${jodatime-version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <swagger-annotations-version>1.5.21</swagger-annotations-version>
-        <gson-version>2.8.6</gson-version>
-        <gson-fire-version>1.8.4</gson-fire-version>
-        <okhttp-version>2.7.5</okhttp-version>
-        <okhttp-logging-version>2.7.5</okhttp-logging-version>
-        <migbase64-version>2.2</migbase64-version>
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <jackson-version>2.10.1</jackson-version>
-        <jodatime-version>2.7</jodatime-version>
-        <junit-version>4.13</junit-version>
-    </properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.iriusrisk</groupId>
+    <artifactId>iriusrisk-client-lib</artifactId>
+    <packaging>jar</packaging>
+    <version>0.1-SNAPSHOT</version>
+    <name>iriusrisk-client-lib</name>
+
+    <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <version>2.4.13</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>swagger.yaml</inputSpec>
+                            <language>java</language>
+                            <configOptions>
+                                <dateLibrary>joda</dateLibrary>
+                                <apiPackage>com.iriusrisk.api</apiPackage>
+                                <modelPackage>com.iriusrisk.model</modelPackage>
+                                <artifactVersion>1</artifactVersion>
+                                <groupId>com.iriusrisk</groupId>
+                                <artifactId>iriusrisk-client-lib</artifactId>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+
+        <!-- You can find the dependencies for the library configuation you chose by looking in JavaClientCodegen.
+             Then find the corresponding dependency on Maven Central, and set the versions in the property section below -->
+
+        <!--
+        Swagger Codegen supports the following Client implementations:
+
+        jersey1 + Jackson
+        Jersey2 + Jackson
+        Feign + Jackson
+        *** OkHttp + Gson ***
+        Retrofit2/OkHttp + Gson
+        Spring RestTemplate + Jackson
+        Resteasy + Jackson
+
+        Ref: https://stackoverflow.com/questions/57545884/how-to-develop-a-simple-rest-client-using-swagger-codegen
+        -->
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp-logging-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>${gson-fire-version}</version>
+        </dependency>
+
+        <!-- Base64 encoding that works in both JVM and Android -->
+        <dependency>
+            <groupId>com.brsanthu</groupId>
+            <artifactId>migbase64</artifactId>
+            <version>${migbase64-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${jodatime-version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
+        <gson-version>2.8.6</gson-version>
+        <gson-fire-version>1.8.4</gson-fire-version>
+        <okhttp-version>2.7.5</okhttp-version>
+        <okhttp-logging-version>2.7.5</okhttp-logging-version>
+        <migbase64-version>2.2</migbase64-version>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+        <jackson-version>2.10.1</jackson-version>
+        <jodatime-version>2.7</jodatime-version>
+        <junit-version>4.13</junit-version>
+    </properties>
 </project>
\ No newline at end of file

From 401bcf9f9b43428f928463ee4252cbbdee1810cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Reyes?= <areyes@continuumsecurity.net>
Date: Wed, 15 Apr 2020 14:29:20 +0200
Subject: [PATCH 2/2] [CON-462] Fixed test class

---
 IriusRiskClientExample.java => IriusRiskClient.java | 1 -
 1 file changed, 1 deletion(-)
 rename IriusRiskClientExample.java => IriusRiskClient.java (98%)

diff --git a/IriusRiskClientExample.java b/IriusRiskClient.java
similarity index 98%
rename from IriusRiskClientExample.java
rename to IriusRiskClient.java
index 7c3f8ee..5806201 100644
--- a/IriusRiskClientExample.java
+++ b/IriusRiskClient.java
@@ -1,7 +1,6 @@
 /*
  * Copyright (c) 2012-2020 Continuum Security.  All rights reserved
  */
-package com.iriusrisk.client;
 
 import com.iriusrisk.ApiException;
 import com.iriusrisk.api.ProductsApi;