Merge f230dad into 83fcb8b

.travis.yml

@@ -1,23 +1,23 @@
+dist: trusty
+sudo: false
 language: java
 jdk:
-  - oraclejdk8
+- oraclejdk8
+git:
+  depth: 3
 cache:
   directories:
-    - "$HOME/.m2"
+  - "$HOME/.m2"
 before_install:
-  - git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
-install:
-  - cp -f $JAVA_HOME/jre/lib/security/cacerts target/travis-settings/cacerts
-  - chmod u+w target/travis-settings/cacerts
-  - $JAVA_HOME/jre/bin/keytool -import -v -noprompt -storepass changeit -storetype jks -trustcacerts -alias IndigoBlueRoot -file target/travis-settings/ROOT-CA.crt -keystore target/travis-settings/cacerts
-script: mvn -Djavax.net.ssl.trustStore=$PWD/target/travis-settings/cacerts -B -C -V -U --settings target/travis-settings/settings.xml verify coveralls:report
-after_success:
-  - '[[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_TAG != release-* ]] && mvn -Djavax.net.ssl.trustStore=$PWD/target/travis-settings/cacerts -DskipTests=true -B -C -V --errors deploy --settings target/travis-settings/settings.xml'
-  - '[[ $TRAVIS_TAG == release-* ]] && mvn -Prelease -Djavax.net.ssl.trustStore=$PWD/target/travis-settings/cacerts -DskipTests=true -B -C -V --errors deploy --settings target/travis-settings/settings.xml'
+- git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
+- ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml
+install: "${PWD}/target/travis-settings/java/install.sh"
+script: "${PWD}/target/travis-settings/java/script.sh coveralls:report"
+after_success: "${PWD}/target/travis-settings/java/after_success.sh"
 notifications:
   slack:
-    secure: "Ml7PRIH3nVt84qjik/jQ1pjJnXLPipvuUw5KHpMDyZrkDRkNtvnoeWep/SuBWGiGgwKBcL8Pi6QB4jTH8pYVuoUrqQ4Ah4cBQihYTAezMIw+xGulF0GvwwefigwKlZB8B73hUaEOUHqjIn19huJpstaw0PH8OF4rpWTbl+ZSTKtdyYZOS6NfgcctyqYNCtYC7/qkBah5jJDx1KEho2pDJthsMF9CxL/bckTm7Giy2W4ehAoeaeDtzTXKBuyv+CfH55XCE8Y/wyO4srXa7Ntefhqm5a4gmJ4A5CDF9UrjRickxPisJxCoRhl8Rm04IGvdEe1A4/dwkLIXodcMXPWSMY/hWfepFZ5Epm2w0I8pWOu0TwIuRrxEedBNM1aRmWa6iHFq8HJULmHrW3Sma6sCpi52GGxcrUbWF78kVS5Lv7K7LgkbWCDvFguIs7d0rc03DZkCBWl1J1e+RSNtaiiT6VNh+R8TDxUUQg5ke7SsUqDs6nZ5efewL+liFeg9k+j0GE4C5sg/oy+KRXGRhk8Yx2Q/SnIa3iKmBvrLPNQ7uzmcycCtT2kfwZ4D+6/7wpPKWiUqHlfPQP+TewepvMU/PQi1nMG6FrIE9L4B9Dh6nyzVT3Eag/mvwbhSTeQgLU5m1VJ4Pvrx4fNNsB1NzwWDtnnqkAQnwcXg9UGKA26qzwI="
+    secure: Ml7PRIH3nVt84qjik/jQ1pjJnXLPipvuUw5KHpMDyZrkDRkNtvnoeWep/SuBWGiGgwKBcL8Pi6QB4jTH8pYVuoUrqQ4Ah4cBQihYTAezMIw+xGulF0GvwwefigwKlZB8B73hUaEOUHqjIn19huJpstaw0PH8OF4rpWTbl+ZSTKtdyYZOS6NfgcctyqYNCtYC7/qkBah5jJDx1KEho2pDJthsMF9CxL/bckTm7Giy2W4ehAoeaeDtzTXKBuyv+CfH55XCE8Y/wyO4srXa7Ntefhqm5a4gmJ4A5CDF9UrjRickxPisJxCoRhl8Rm04IGvdEe1A4/dwkLIXodcMXPWSMY/hWfepFZ5Epm2w0I8pWOu0TwIuRrxEedBNM1aRmWa6iHFq8HJULmHrW3Sma6sCpi52GGxcrUbWF78kVS5Lv7K7LgkbWCDvFguIs7d0rc03DZkCBWl1J1e+RSNtaiiT6VNh+R8TDxUUQg5ke7SsUqDs6nZ5efewL+liFeg9k+j0GE4C5sg/oy+KRXGRhk8Yx2Q/SnIa3iKmBvrLPNQ7uzmcycCtT2kfwZ4D+6/7wpPKWiUqHlfPQP+TewepvMU/PQi1nMG6FrIE9L4B9Dh6nyzVT3Eag/mvwbhSTeQgLU5m1VJ4Pvrx4fNNsB1NzwWDtnnqkAQnwcXg9UGKA26qzwI=
 env:
   global:
-    - secure: "O+XNn6jqIFGc05mbt9Pbq+77sArwHfGIoMdd8C/r3/1ZnQbj+tfvzNX4tl/xEncSRIA95TrZ0a3Z/VHwqjEw1W8yOJiCz/xAsW0k6/Lqz5IOvB/G+jNyhMVbFh/hIttJ3O0JDsQ9UINsD5HxFKoPKCa+LAy3CaSutlTnlm/yQeFVCe/otovqpDf0IeW0DuR/WryovwdMrX4TO4CB4+eRZ1maHrFZ7Pkwq8FdTWhHFiABc7K+TKOeHJZ0kgfYHGTXQuUgHuz+F1ehdGq8fC3cWinY8E3UMJO7POfDDW5pd7kXhK/F2eZhwBnfSHn4MEW35zQaOvkZqn7dr/tthNA4wjLt8ttXGBRcL4C4tQxnqyNcnqKwDztSYInpALQLpTlzwJUggQeW9GQjRoPL8dtPCXI314NH2kTQMAxov4cq8rDPKsFLV2SyypndKxQKaarUJCTxRxVYN22GAuTG3BQNfoptC31MfXCrpTuB8g6+JVEgHKdHioco4rzThzzfXPwoxfWr7wshySC+lgefMPoQPx62OhCH2p5hgDIoOGxJUrWRvO70D38vCkNivhfBoJTIWJR2atBwF7IAJWyRGJzLTeDKsZqBOvKRbId3CHHmYNL6B2Tp9fSn3GFReg63FBxzY31zSQps014Wx5XX93VNGKdIn3O9ePFGpx1Fme534P4="
-    - secure: "BKtf+xlcIBUPi2M9VfwNBmzrwQJg17whLkkXhWo2mx2ujcB6Z22iZnFuTyLRbga05QrSPoHy8IAc4OvxjVDTuE0mhkLNoiEeHq6tnJfvlPImfvv2dxn7uKi9d4/30nvwwuH5aPi/ybXc4kWy56+d/KKstP2hnajQ4fIRBRsBrAh9CgsuwqKudepDUPuSB3vpowgzDyS8X9NoIzHrMC9cshkeORK45NMA9vqWSEMuhlRR2O6bTwZ5s+2uwcdbUxC5lteeVZiLXhUbuLgcrYSaNJpM2J4Ed6+KD4zAH5o4cDLOlIQC4arrc3BtXgI1B9EhStZVqQqpy8zZHHBs3xs6f/RC1KnywjhlnQGoLTCsR8eTGHgJ+0mzhqhWJDYIazIVprlMK1VT2epJ68rf2O70dILjmXpugnycgtL1lehuaz4JjH4/1RqgJh9ep6B7WDXWnj5FDKqIapks3VDNKXgGi2c8HltwdClumHItUDaS2mBW+YSdFjfpPpLFP1rWUcVUba+FWKHQQ+RrXfj0k/W0ZncRPbsbH8+k4joB2XgD2xC5sJxVz00ZlSmtQgtZXpl5pbj36847qGhATaqOP22jHJnWRU00RbjocNs8kmgXXC6t+Ok3GqbhODKMyTJzPaMi/KYuALA5YlkJNEdvOKNIQlURuZT5kPFPB+6Y9RsLNCw="
+  - secure: hCoav5AcRn/u1GZcCMMs3RUKmVjGMOxbMyGL9asmOStnZoXXN5/lxKMcGA0Q2c6luBXOcnnofWyI2QwXboEdXn7cLJcDDh+oklzRq3HoPdHQ3Ex0uDOY+h0z/p/gzpc6Kw+K2LypmzjEbWdRg0z7zVgdSWD/oSRSg7bmTMyD6guoCN4rFNjdu8s+xsI9ZhMGB3Gu0vV27uNI3s/o3A0CitCyXGewaXyrLWC5z61r+nOq19BFS8ZCwOy5pm8s0ofs3h4wMuRMeP7Lmo7j4dB/xjiNiJhBr9qtE/pxHdZm6jDAr/mPDhVCw/Vuj27vGeUOUOpav1uKMvQ0A3Hn62q6qj8ZaVHjS52Idlc3nlDo7O8xe0BIREHLcpFgwO8ySWNPEbzp/WATkzfroPrOOd7hZuXMIE3ZsZD//zUnqE5HvIsytvcEJXdsL8U00lmllMvSIMsgaY/ZD4lhK78yjZ2APj7Shy7dmUQDhN3/0vQauZkJCw9qXdzz+4c7dxyptZSbyIm2zecgCQbSkZzNoElwcKTzMXzylGSSo45EM1k4e0D/LQeaEJY204OCnPGSUknEa+OQ7stxFt4i5NVSQwMdT78KDSQqvToxEnU0RCAw5nqsWoT/8G42DZWY5kfoY69N3vAMKJtlH/pYq1HgJPIZWYSIrnEyfOeBtzEDp/fHk+s=
+  - secure: Vhzj9sD6/SLTQ6jgV3jRpNGKsHV+eoFq47aFeX4FZFpZI/dd/HTWqqOgnTJF/J1C4+EFkJARqtJSJvUwiLX85PP9gxVem2qe2PC+c6PBvrQZP1a5mkDmO1FpDQjvByLFtL90BTJYYFgtIQj65jyx/y8I0guh+wkJNI9GT8T63VkhitfbL8YFQFBB+K6WGQEr/Ip3hfCmj+Sbpnm4fZdL5p0JyMHRnm5gfxN17XGFyAKAwivlZ8B1K7waYkO7qFtwViqkYBdKE2q5E86I7hn676NX4SF8ikE5MydrjJ0nn8uo2CLn+eI4ekr/W+7qCjh/Fxtmw/vgcrdWk3jmw7QnIsa+CnXNOqIaiKoyBpop2a3vEXRWZUXoWpkRUVadQW565/zfKF4MxTmzX5PQJ2IiixXJX4HOokS9CVHq330hC/J8Ih/SHS7L+8SZhPPYpcex34VPIXzybNQPe4fNslKsr2iVqsy7f1OXpacgszBu6T4S82GHy5gl2LC6COJLskvWvKp4swbGp/+lbpvY0KtXI38ks/FHi15F2JaW5+SjpFFX8F7b0CB3dLPEY2NeRppfXfgPVQJ4hYG8Dsb3PsgXh0EyUj3xRvq+kO1gFhcBsRKKV647LBHbeyMLAf0pvKfzrjFHuHP+2c9WLQueHVFf4ukYXv6IDqrsERW5EEqs3o8=

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>maven-framework-parent-pom</artifactId>
-        <version>1.5.0</version>
+        <version>1.6.0</version>
     </parent>
 
     <groupId>uk.gov.justice.utils</groupId>
@@ -22,9 +22,16 @@
     </modules>
 
     <properties>
-        <common-bom.version>1.16.0</common-bom.version>
+        <common-bom.version>1.17.0</common-bom.version>
+        <cpp.repo.name>test-utils</cpp.repo.name>
     </properties>
 
+    <scm>
+        <connection>${cpp.scm.connection}</connection>
+        <developerConnection>${cpp.scm.developerConnection}</developerConnection>
+        <url>${cpp.scm.url}</url>
+    </scm>
+
     <dependencyManagement>
         <dependencies>
             <dependency>

test-utils-core/pom.xml

@@ -12,6 +12,12 @@
 
     <artifactId>test-utils-core</artifactId>
 
+    <scm>
+        <connection>${cpp.scm.connection}</connection>
+        <developerConnection>${cpp.scm.developerConnection}</developerConnection>
+        <url>${cpp.scm.url}</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish</groupId>

test-utils-logging-log4j/pom.xml

@@ -11,6 +11,14 @@
 
     <artifactId>test-utils-logging-log4j</artifactId>
     <packaging>pom</packaging>
+
+    <scm>
+        <connection>${cpp.scm.connection}</connection>
+        <developerConnection>${cpp.scm.developerConnection}</developerConnection>
+        <url>${cpp.scm.url}</url>
+    </scm>
+
+
     <dependencies>
 
         <!-- Redirect other logging implementations over SLF4J -->

test-utils-logging-simple/pom.xml

@@ -11,6 +11,13 @@
 
     <artifactId>test-utils-logging-simple</artifactId>
     <packaging>pom</packaging>
+
+    <scm>
+        <connection>${cpp.scm.connection}</connection>
+        <developerConnection>${cpp.scm.developerConnection}</developerConnection>
+        <url>${cpp.scm.url}</url>
+    </scm>
+
     <dependencies>
 
         <!-- Redirect other logging implementations over SLF4J -->