Merge branch 'develop' into gh-2680-fix-spark-packages-repo-priority

Author: GCHQDeveloper314

Diff for: library/tinkerpop/pom.xml

@@ -102,7 +102,7 @@
                         <id>gafferpop</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>assembly</goal>
+                            <goal>single</goal>
                         </goals>
                         <configuration>
                             <descriptorRefs>

Diff for: pom.xml

@@ -107,6 +107,7 @@
         <gpg.plugin.version>3.1.0</gpg.plugin.version>
         <install.plugin.version>3.0.0-M1</install.plugin.version>
         <resources.plugin.version>3.2.0</resources.plugin.version>
+        <assembly.plugin.version>3.6.0</assembly.plugin.version>
         <clean.plugin.version>3.2.0</clean.plugin.version>
         <jacoco.plugin.version>0.8.10</jacoco.plugin.version>
         <jar.plugin.version>3.2.2</jar.plugin.version>
@@ -872,6 +873,11 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>${resources.plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>${assembly.plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>