Organize pom

pom.xml

@@ -141,16 +141,6 @@
   </scm>
 
   <developers>
-    <developer>
-      <id>adriancole</id>
-      <name>Adrian Cole</name>
-      <email>acole@pivotal.io</email>
-    </developer>
-    <developer>
-      <id>spencergibb</id>
-      <name>Spencer Gibb</name>
-      <email>spencer@gibb.us</email>
-    </developer>
     <developer>
       <id>velo</id>
       <name>Marvin Herman Froeder</name>
@@ -164,6 +154,17 @@
     </developer>
   </developers>
 
+  <contributors>
+    <contributor>
+      <name>Adrian Cole</name>
+      <email>acole@pivotal.io</email>
+    </contributor>
+    <contributor>
+      <name>Spencer Gibb</name>
+      <email>spencer@gibb.us</email>
+    </contributor>
+  </contributors>
+
   <distributionManagement>
     <repository>
       <id>ossrh</id>
@@ -696,7 +697,7 @@
             <DynamicDependency>
               <groupId>org.apache.maven.surefire</groupId>
               <artifactId>surefire-junit4</artifactId>
-              <version>2.22.0</version>
+              <version>${maven-surefire-plugin.version}</version>
               <repositoryType>PLUGIN</repositoryType>
             </DynamicDependency>
             <DynamicDependency>