From da66e17292c58bd907275bf790ef0e9fefd44c59 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Tue, 10 Mar 2020 11:31:57 +0100
Subject: [PATCH 01/13] no default build phase for dep-check

---
 pom.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3006dd7b61bc..70ebced6d95a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@
         <cs.jar-plugin.version>3.2.0</cs.jar-plugin.version>
         <cs.pmd-plugin.version>3.12.0</cs.pmd-plugin.version>
         <cs.project-info-plugin.version>3.0.0</cs.project-info-plugin.version>
+        <cs.owasp.dependency-checker-plugin.version>5.3.0</cs.owasp.dependency-checker-plugin.version>
         <cs.release-plugin.version>2.5.3</cs.release-plugin.version>
         <cs.resources-plugin.version>3.1.0</cs.resources-plugin.version>
         <cs.site-plugin.version>3.8.2</cs.site-plugin.version>
@@ -999,6 +1000,22 @@
                         </excludes>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>${cs.owasp.dependency-checker-plugin.version}</version>
+                    <configuration>
+                        <skipProvidedScope>true</skipProvidedScope>
+                        <skipRuntimeScope>true</skipRuntimeScope>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -1136,6 +1153,18 @@
     </build>
     <reporting>
         <plugins>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>${cs.owasp.dependency-checker-plugin.version}</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>

From 37654d0b5ecb7ea50d619d8bd35c26f1de01e8bb Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Fri, 14 Feb 2020 13:44:41 +0100
Subject: [PATCH 02/13] replace findbugs with spotbugs

---
 pom.xml | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 70ebced6d95a..8165fa449bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,8 @@
         <cs.compiler-plugin.version>3.8.1</cs.compiler-plugin.version>
         <cs.dependency-plugin.version>3.1.1</cs.dependency-plugin.version>
         <cs.failsafe-plugin.version>2.22.2</cs.failsafe-plugin.version>
-        <cs.findbugs-plugin.version>3.0.5</cs.findbugs-plugin.version>
+        <cs.spotbugs.version>3.1.12</cs.spotbugs.version>
+        <cs.spotbugs-maven-plugin.version>3.1.12.2</cs.spotbugs-maven-plugin.version>
         <cs.jar-plugin.version>3.2.0</cs.jar-plugin.version>
         <cs.pmd-plugin.version>3.12.0</cs.pmd-plugin.version>
         <cs.project-info-plugin.version>3.0.0</cs.project-info-plugin.version>
@@ -720,11 +721,12 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>${cs.spotbugs-maven-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>cloudstack-findbugs</id>
+                        <id>cloudstack-spotbugs</id>
                         <phase>none</phase>
                         <goals>
                             <goal>check</goal>
@@ -1070,19 +1072,9 @@
                     <version>${cs.dependency-plugin.version}</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>cobertura-maven-plugin</artifactId>
-                    <configuration>
-                        <formats>
-                            <format>html</format>
-                            <format>xml</format>
-                        </formats>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>${cs.findbugs-plugin.version}</version>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
+                    <version>${cs.spotbugs-maven-plugin.version}</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cloudstack</groupId>
@@ -1100,7 +1092,7 @@
                     </configuration>
                     <executions>
                         <execution>
-                            <id>cloudstack-findbugs</id>
+                            <id>cloudstack-spotbugs</id>
                             <goals>
                                 <goal>check</goal>
                             </goals>
@@ -1166,9 +1158,9 @@
                 </reportSets>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>${cs.findbugs-plugin.version}</version>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>${cs.spotbugs-maven-plugin.version}</version>
                 <configuration>
                     <threshold>Low</threshold><!-- High|Normal|Low|Exp|Ignore -->
                     <effort>Default</effort><!-- Min|Default|Max -->
@@ -1282,11 +1274,11 @@
 <!--                         <artifactId>maven-pmd-plugin</artifactId> -->
 <!--                     </plugin> -->
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>findbugs-maven-plugin</artifactId>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>cloudstack-findbugs</id>
+                                <id>cloudstack-spotbugs</id>
                                 <phase>process-classes</phase>
                                 <inherited>true</inherited>
                             </execution>

From cdb7555b79b31a0bafee0f27b0642c70decfd255 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Sun, 16 Feb 2020 14:36:18 +0100
Subject: [PATCH 03/13] for target site checkstyle needs explicit version

---
 tools/checkstyle/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index c07c01667ef9..0e99a8fb268e 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -28,4 +28,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>

From 60b3dba6f3b2783748521e467c6c3bfe3f1003e8 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Sun, 16 Feb 2020 14:40:28 +0100
Subject: [PATCH 04/13] cleanup

---
 pom.xml | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8165fa449bb1..36463a68173c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
         <cs.jasypt.version>1.9.3</cs.jasypt.version>
         <cs.java-ipv6.version>0.17</cs.java-ipv6.version>
         <cs.javassist.version>3.26.0-GA</cs.javassist.version>
-        <cs.javadoc.version>3.1.1</cs.javadoc.version>
+        <cs.maven-javadoc-plugin.version>3.1.1</cs.maven-javadoc-plugin.version>
         <cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
         <cs.jaxb.version>2.3.0</cs.jaxb.version>
         <cs.jaxws.version>2.3.2</cs.jaxws.version>
@@ -174,7 +174,6 @@
     <distributionManagement>
         <site>
             <id>apache.cloudstack.site</id>
-            <url>${site.deploy.url}</url>
         </site>
     </distributionManagement>
 
@@ -1140,6 +1139,31 @@
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>${cs.failsafe-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>${cs.jacoco-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>prepare-coverage-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>produce-coverage-reports</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>${cs.site-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -1170,22 +1194,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${cs.javadoc.version}</version>
+                <version>${cs.maven-javadoc-plugin.version}</version>
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>1g</maxmemory>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>${cs.project-info-plugin.version}</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>${cs.cobertura-plugin.version}</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>

From 2c8143f7260eeed5f9746267f93897e0e75f39cc Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Sun, 16 Feb 2020 17:21:31 +0100
Subject: [PATCH 05/13] new clover

---
 pom.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/pom.xml b/pom.xml
index 36463a68173c..5a0315ff5b02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
         <cs.resources-plugin.version>3.1.0</cs.resources-plugin.version>
         <cs.site-plugin.version>3.8.2</cs.site-plugin.version>
         <cs.surefire-plugin.version>2.22.2</cs.surefire-plugin.version>
+        <cs.clover-maven-plugin.version>4.4.1</cs.clover-maven-plugin.version>
 
         <!-- Logging versions -->
         <cs.log4j.version>1.2.17</cs.log4j.version>
@@ -733,6 +734,42 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.openclover</groupId>
+                <artifactId>clover-maven-plugin</artifactId>
+                <version>${cs.clover-maven-plugin.version}</version>
+                <configuration>
+                    <flushPolicy>threaded</flushPolicy>
+                    <flushInterval>100</flushInterval>
+                    <targetPercentage>0%</targetPercentage>
+                    <generateHtml>true</generateHtml>
+                    <generateXml>true</generateXml>
+                    <generateHistorical>true</generateHistorical>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>main</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>aggregate</goal>
+                            <goal>check</goal>
+                            <goal>log</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>site</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>aggregate</goal>
+                            <!-- We save a history point in order to have data to generate a historical report -->
+                            <goal>save-history</goal>
+
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -1198,6 +1235,7 @@
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>1g</maxmemory>
+                    <show>public</show>
                 </configuration>
             </plugin>
             <plugin>
@@ -1298,6 +1336,15 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.openclover</groupId>
+                        <artifactId>clover-maven-plugin</artifactId>
+                        <version>${cs.clover-maven-plugin.version}</version>
+                        <configuration>
+                            <generateHistorical>true</generateHistorical>
+                            <generateHtml>true</generateHtml>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

From 7a8b79b1c14d2fb68bc6e590d9d6a8cc9c29b9c4 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Wed, 11 Mar 2020 00:52:58 +0100
Subject: [PATCH 06/13] remove reports in error

---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a0315ff5b02..67e72fd0fff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1124,7 +1124,6 @@
                         <xmlOutput>true</xmlOutput>
                         <failOnError>false</failOnError>
                         <maxHeap>2048</maxHeap>
-                        <excludeFilterFile>findbugsExcludeFilter.xml</excludeFilterFile>
                     </configuration>
                     <executions>
                         <execution>
@@ -1225,17 +1224,6 @@
                 <configuration>
                     <threshold>Low</threshold><!-- High|Normal|Low|Exp|Ignore -->
                     <effort>Default</effort><!-- Min|Default|Max -->
-                    <excludeFilterFile>${basedir}/findbugsExcludeFilter.xml</excludeFilterFile>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${cs.maven-javadoc-plugin.version}</version>
-                <configuration>
-                    <minmemory>128m</minmemory>
-                    <maxmemory>1g</maxmemory>
-                    <show>public</show>
                 </configuration>
             </plugin>
             <plugin>

From cea782900145642dc3d784a87c5a699020a2feed Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Wed, 11 Mar 2020 12:57:34 +0100
Subject: [PATCH 07/13] jacoco and clover

---
 pom.xml                  | 27 ++++++++++++++++++++-------
 tools/checkstyle/pom.xml |  5 +++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67e72fd0fff7..6049bb3c213e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <cs.antrun-plugin.version>1.8</cs.antrun-plugin.version>
         <cs.builder-helper-plugin.version>3.0.0</cs.builder-helper-plugin.version>
         <cs.checkstyle-plugin.version>3.1.0</cs.checkstyle-plugin.version>
-        <cs.cobertura-plugin.version>2.7</cs.cobertura-plugin.version>
+        <cs.jacoco-plugin.version>0.8.3</cs.jacoco-plugin.version>
         <cs.compiler-plugin.version>3.8.1</cs.compiler-plugin.version>
         <cs.dependency-plugin.version>3.1.1</cs.dependency-plugin.version>
         <cs.failsafe-plugin.version>2.22.2</cs.failsafe-plugin.version>
@@ -734,6 +734,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${cs.jacoco-plugin.version}</version>
+            </plugin>
             <plugin>
                 <groupId>org.openclover</groupId>
                 <artifactId>clover-maven-plugin</artifactId>
@@ -765,7 +770,6 @@
                             <goal>aggregate</goal>
                             <!-- We save a history point in order to have data to generate a historical report -->
                             <goal>save-history</goal>
-
                         </goals>
                     </execution>
                 </executions>
@@ -1167,7 +1171,7 @@
                     <version>${cs.surefire-plugin.version}</version>
                     <configuration>
                         <useSystemClassLoader>false</useSystemClassLoader>
-                        <argLine>-Djava.security.egd=file:/dev/./urandom -noverify</argLine>
+                        <argLine>@{argLine} -Djava.security.egd=file:/dev/./urandom -noverify</argLine>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -1236,6 +1240,19 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>${cs.resources-plugin.version}</version>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${cs.jacoco-plugin.version}</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <!-- select non-aggregate reports -->
+                            <report>report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
         </plugins>
     </reporting>
     <profiles>
@@ -1309,10 +1326,6 @@
             <id>enablefindbugs</id>
             <build>
                 <plugins>
-<!--                     <plugin> -->
-<!--                         <groupId>org.apache.maven.plugins</groupId> -->
-<!--                         <artifactId>maven-pmd-plugin</artifactId> -->
-<!--                     </plugin> -->
                     <plugin>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-maven-plugin</artifactId>
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index 0e99a8fb268e..a63f62c9aa1b 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -36,6 +36,11 @@
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.8.2</version>
             </plugin>
+            <plugin>
+                <groupId>org.openclover</groupId>
+                <artifactId>clover-maven-plugin</artifactId>
+                <version>4.4.1</version>
+            </plugin>
         </plugins>
     </build>
 </project>

From 94da2900ae1c276815a667b47c52820e197306f9 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Wed, 11 Mar 2020 15:59:02 +0100
Subject: [PATCH 08/13] but it worked on my laptop??

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6049bb3c213e..4e47e3e1aeab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,6 +634,11 @@
                 <artifactId>wsdl4j</artifactId>
                 <version>1.6.3</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.doxia</groupId>
+                <artifactId>doxia-site-renderer</artifactId>
+                <version>1.8.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 68d6f7dcbb0d5d8e80dd05e279d42bde636f24b6 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Thu, 12 Mar 2020 09:48:41 +0100
Subject: [PATCH 09/13] version upgrades

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e47e3e1aeab..4c54a59d3a8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
         <cs.configuration.version>1.10</cs.configuration.version>
         <cs.daemon.version>1.2.2</cs.daemon.version>
         <cs.dbcp.version>2.7.0</cs.dbcp.version>
-        <cs.discovery.version>0.5</cs.discovery.version>
+        <cs.discovery.version>1.0-dev</cs.discovery.version>
         <cs.lang.version>2.6</cs.lang.version>
         <cs.pool.version>2.7.0</cs.pool.version>
 
@@ -140,7 +140,7 @@
         <cs.maven-javadoc-plugin.version>3.1.1</cs.maven-javadoc-plugin.version>
         <cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
         <cs.jaxb.version>2.3.0</cs.jaxb.version>
-        <cs.jaxws.version>2.3.2</cs.jaxws.version>
+        <cs.jaxws.version>2.6</cs.jaxws.version>
         <cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
         <cs.jetty.version>9.4.26.v20200117</cs.jetty.version>
         <cs.jetty-maven-plugin.version>9.4.26.v20200117</cs.jetty-maven-plugin.version>
@@ -637,7 +637,7 @@
             <dependency>
                 <groupId>org.apache.maven.doxia</groupId>
                 <artifactId>doxia-site-renderer</artifactId>
-                <version>1.8.1</version>
+                <version>1.9.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

From 880beec467681226a5a139d4fa91010f176152cf Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Thu, 12 Mar 2020 11:10:28 +0100
Subject: [PATCH 10/13] more dependencies managed

---
 pom.xml | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c54a59d3a8d..dbf819d2539e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
         <cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
         <cs.commons-io.version>2.6</cs.commons-io.version>
         <cs.commons-lang3.version>3.9</cs.commons-lang3.version>
+        <cs.commons-logging.version>1.2</cs.commons-logging.version>
         <cs.commons-net.version>3.6</cs.commons-net.version>
         <cs.commons-validator.version>1.6</cs.commons-validator.version>
         <cs.configuration.version>1.10</cs.configuration.version>
@@ -145,7 +146,7 @@
         <cs.jetty.version>9.4.26.v20200117</cs.jetty.version>
         <cs.jetty-maven-plugin.version>9.4.26.v20200117</cs.jetty-maven-plugin.version>
         <cs.jna.version>4.0.0</cs.jna.version>
-        <cs.joda-time.version>2.8.1</cs.joda-time.version>
+        <cs.joda-time.version>2.10.5</cs.joda-time.version>
         <cs.jpa.version>2.2.1</cs.jpa.version>
         <cs.jsch.version>0.1.55</cs.jsch.version>
         <cs.json.version>20090211</cs.json.version>
@@ -371,6 +372,11 @@
                 <artifactId>commons-lang</artifactId>
                 <version>${cs.lang.version}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${cs.commons-logging.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-net</groupId>
                 <artifactId>commons-net</artifactId>
@@ -386,6 +392,11 @@
                 <artifactId>commons-validator</artifactId>
                 <version>${cs.commons-validator.version}</version>
             </dependency>
+            <dependency>
+                <groupId>javax.annotation</groupId>
+                <artifactId>javax.annotation-api</artifactId>
+                <version>${cs.javax.annotation.version}</version>
+            </dependency>
             <dependency>
                 <groupId>javax.mail</groupId>
                 <artifactId>mail</artifactId>
@@ -396,6 +407,11 @@
                 <artifactId>javax.servlet-api</artifactId>
                 <version>${cs.servlet.version}</version>
             </dependency>
+            <dependency>
+                <groupId>joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>${cs.joda-time.version}</version>
+            </dependency>
             <dependency>
                 <groupId>jstl</groupId>
                 <artifactId>jstl</artifactId>
@@ -473,6 +489,11 @@
                 <artifactId>kafka-clients</artifactId>
                 <version>${cs.kafka-clients.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.doxia</groupId>
+                <artifactId>doxia-site-renderer</artifactId>
+                <version>1.9.1</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
@@ -635,9 +656,14 @@
                 <version>1.6.3</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.maven.doxia</groupId>
-                <artifactId>doxia-site-renderer</artifactId>
-                <version>1.9.1</version>
+                <groupId>xerces</groupId>
+                <artifactId>xercesimpl</artifactId>
+                <version>2.12.0</version>
+            </dependency>
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>2.0.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

From 2ce46c771fa408102028dfa09506ffe2609ad2f6 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Fri, 13 Mar 2020 10:12:27 +0100
Subject: [PATCH 11/13] google http client and jackson

---
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dbf819d2539e..814f76130b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,13 +128,14 @@
         <cs.cxf.version>3.2.6</cs.cxf.version>
         <cs.ehcache.version>2.6.11</cs.ehcache.version>
         <cs.globodns-client.version>0.0.27</cs.globodns-client.version>
+        <cs.google-http-client>1.34.2</cs.google-http-client>
         <cs.groovy.version>2.4.17</cs.groovy.version>
         <cs.gson.version>1.7.2</cs.gson.version>
         <cs.guava.version>28.2-jre</cs.guava.version>
         <cs.httpclient.version>4.5.11</cs.httpclient.version>
         <cs.httpcore.version>4.4.13</cs.httpcore.version>
         <cs.influxdb-java.version>2.17</cs.influxdb-java.version>
-        <cs.jackson.version>2.9.10</cs.jackson.version>
+        <cs.jackson.version>2.10.3</cs.jackson.version>
         <cs.jasypt.version>1.9.3</cs.jasypt.version>
         <cs.java-ipv6.version>0.17</cs.java-ipv6.version>
         <cs.javassist.version>3.26.0-GA</cs.javassist.version>
@@ -281,6 +282,12 @@
                 <artifactId>aws-java-sdk-s3</artifactId>
                 <version>${cs.aws.sdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${cs.jackson.version}</version>
+                <type>bundle</type>
+            </dependency>
             <dependency>
                 <groupId>com.globo.globodns</groupId>
                 <artifactId>globodns-client</artifactId>
@@ -296,6 +303,11 @@
                 <artifactId>guava</artifactId>
                 <version>${cs.guava.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.http-client</groupId>
+                <artifactId>google-http-client</artifactId>
+                <version>${cs.google-http-client}</version>
+            </dependency>
             <dependency>
                 <groupId>com.googlecode.java-ipv6</groupId>
                 <artifactId>java-ipv6</artifactId>

From 91144c03ccd145a1513340b5f4a1231da5dc69f3 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Mon, 16 Mar 2020 16:18:45 +0100
Subject: [PATCH 12/13] downgrade discovery back to the official release

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 814f76130b65..5e6c31c9993d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
         <cs.configuration.version>1.10</cs.configuration.version>
         <cs.daemon.version>1.2.2</cs.daemon.version>
         <cs.dbcp.version>2.7.0</cs.dbcp.version>
-        <cs.discovery.version>1.0-dev</cs.discovery.version>
+        <cs.discovery.version>0.5</cs.discovery.version>
         <cs.lang.version>2.6</cs.lang.version>
         <cs.pool.version>2.7.0</cs.pool.version>
 

From f8574775f4fe686b77b3d90e4a7b4202fefc5404 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Mon, 23 Mar 2020 16:47:08 +0100
Subject: [PATCH 13/13] jaxws version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5e6c31c9993d..b3cab5a6ced9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
         <cs.maven-javadoc-plugin.version>3.1.1</cs.maven-javadoc-plugin.version>
         <cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
         <cs.jaxb.version>2.3.0</cs.jaxb.version>
-        <cs.jaxws.version>2.6</cs.jaxws.version>
+        <cs.jaxws.version>2.3.2-1</cs.jaxws.version>
         <cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
         <cs.jetty.version>9.4.26.v20200117</cs.jetty.version>
         <cs.jetty-maven-plugin.version>9.4.26.v20200117</cs.jetty-maven-plugin.version>